Commit 09c50b4a authored by Paul Moore's avatar Paul Moore Committed by James Morris

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: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 586c2500
...@@ -490,8 +490,10 @@ int selinux_netlbl_socket_setsockopt(struct socket *sock, ...@@ -490,8 +490,10 @@ int selinux_netlbl_socket_setsockopt(struct socket *sock,
lock_sock(sk); lock_sock(sk);
rc = netlbl_sock_getattr(sk, &secattr); rc = netlbl_sock_getattr(sk, &secattr);
release_sock(sk); release_sock(sk);
if (rc == 0 && secattr.flags != NETLBL_SECATTR_NONE) if (rc == 0)
rc = -EACCES; rc = -EACCES;
else if (rc == -ENOMSG)
rc = 0;
netlbl_secattr_destroy(&secattr); netlbl_secattr_destroy(&secattr);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment