Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

selinux: Fix the NetLabel glue code for setsockopt()

At some point we (okay, I) managed to break the ability for users to use the
setsockopt() syscall to set IPv4 options when NetLabel was not active on the
socket in question. The problem was noticed by someone trying to use the
"-R" (record route) option of ping:

# ping -R 10.0.0.1
ping: record route: No message of desired type

The solution is relatively simple, we catch the unlabeled socket case and
clear the error code, allowing the operation to succeed. Please note that we
still deny users the ability to override IPv4 options on socket's which have
NetLabel labeling active; this is done to ensure the labeling remains intact.

Signed-off-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: James Morris <jmorris@namei.org>

authored by

Paul Moore and committed by
James Morris
09c50b4a 586c2500

+3 -1
+3 -1
security/selinux/netlabel.c
··· 490 490 lock_sock(sk); 491 491 rc = netlbl_sock_getattr(sk, &secattr); 492 492 release_sock(sk); 493 - if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE) 493 + if (rc == 0) 494 494 rc = -EACCES; 495 + else if (rc == -ENOMSG) 496 + rc = 0; 495 497 netlbl_secattr_destroy(&secattr); 496 498 } 497 499