Commit 17617cd5 authored by Paolo Abeni's avatar Paolo Abeni Committed by Greg Kroah-Hartman

selinux: do not report error on connect(AF_UNSPEC)

[ Upstream commit c7e0d6cc ]

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

Fix the above falling back to the generic/old code when the address family
is not AF_INET{4,6}, but leave the SCTP code path untouched, as it has
specific constraints.

Fixes: 68741a8a ("selinux: Fix ltp test connect-syscall failure")
Reported-by: default avatarTom Deseyn <tdeseyn@redhat.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ad0ccae
...@@ -4572,7 +4572,7 @@ static int selinux_socket_connect_helper(struct socket *sock, ...@@ -4572,7 +4572,7 @@ static int selinux_socket_connect_helper(struct socket *sock,
struct lsm_network_audit net = {0,}; struct lsm_network_audit net = {0,};
struct sockaddr_in *addr4 = NULL; struct sockaddr_in *addr4 = NULL;
struct sockaddr_in6 *addr6 = NULL; struct sockaddr_in6 *addr6 = NULL;
unsigned short snum; unsigned short snum = 0;
u32 sid, perm; u32 sid, perm;
/* sctp_connectx(3) calls via selinux_sctp_bind_connect() /* sctp_connectx(3) calls via selinux_sctp_bind_connect()
...@@ -4595,12 +4595,12 @@ static int selinux_socket_connect_helper(struct socket *sock, ...@@ -4595,12 +4595,12 @@ static int selinux_socket_connect_helper(struct socket *sock,
break; break;
default: default:
/* Note that SCTP services expect -EINVAL, whereas /* Note that SCTP services expect -EINVAL, whereas
* others expect -EAFNOSUPPORT. * others must handle this at the protocol level:
* connect(AF_UNSPEC) on a connected socket is
* a documented way disconnect the socket.
*/ */
if (sksec->sclass == SECCLASS_SCTP_SOCKET) if (sksec->sclass == SECCLASS_SCTP_SOCKET)
return -EINVAL; return -EINVAL;
else
return -EAFNOSUPPORT;
} }
err = sel_netport_sid(sk->sk_protocol, snum, &sid); err = sel_netport_sid(sk->sk_protocol, snum, &sid);
......
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