lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selinux: do not report error on connect(AF_UNSPEC)

Browse Source 
calling connect(AF_UNSPEC) on an already connected TCP socket is an
established way to disconnect() such socket. After commit 68741a8ada
("selinux: Fix ltp test connect-syscall failure") it no longer works
and, in the above scenario connect() fails with EAFNOSUPPORT.

Fix the above explicitly early checking for AF_UNSPEC family, and
returning success in that case.

Reported-by: Tom Deseyn <tdeseyn@redhat.com>
Cc: stable@vger.kernel.org
Fixes: 68741a8ada ("selinux: Fix ltp test connect-syscall failure")
Suggested-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Paolo Abeni 2019-05-10 19:12:33 +02:00 committed by Paul Moore
parent 35a196bef4
commit 05174c95b8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/selinux/hooks.c
View File

@ -4637,6 +4637,14 @@ static int selinux_socket_connect_helper(struct socket *sock,
err = sock_has_perm(sk, SOCKET__CONNECT); err = sock_has_perm(sk, SOCKET__CONNECT);
if (err) if (err)
return err; return err;
if (addrlen < offsetofend(struct sockaddr, sa_family))
return -EINVAL;
/* connect(AF_UNSPEC) has special handling, as it is a documented
* way to disconnect the socket
*/
if (address->sa_family == AF_UNSPEC)
return 0;
/* /*
* If a TCP, DCCP or SCTP socket, check name_connect permission * If a TCP, DCCP or SCTP socket, check name_connect permission
@ -4657,8 +4665,6 @@ static int selinux_socket_connect_helper(struct socket *sock,
* need to check address->sa_family as it is possible to have * need to check address->sa_family as it is possible to have
* sk->sk_family = PF_INET6 with addr->sa_family = AF_INET. * sk->sk_family = PF_INET6 with addr->sa_family = AF_INET.
*/ */
if (addrlen < offsetofend(struct sockaddr, sa_family))
return -EINVAL;
switch (address->sa_family) { switch (address->sa_family) {
case AF_INET: case AF_INET:
addr4 = (struct sockaddr_in *)address; addr4 = (struct sockaddr_in *)address;