iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "selinux: do not report error on connect(AF_UNSPEC)"

Browse Source 
This reverts commit c7e0d6cca86581092cbbf2cd868b3601495554cf.

It was agreed a slightly different fix via the selinux tree.

v1 -> v2:
 - use the correct reverted commit hash

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paolo Abeni 2019-05-10 11:37:58 +02:00 committed by David S. Miller
parent b970afcfca
commit e711ab936a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
security/selinux/hooks.c
View File

@ -4649,7 +4649,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 = 0; unsigned short snum;
u32 sid, perm; u32 sid, perm;
/* sctp_connectx(3) calls via selinux_sctp_bind_connect() /* sctp_connectx(3) calls via selinux_sctp_bind_connect()
@ -4674,12 +4674,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 must handle this at the protocol level: * others expect -EAFNOSUPPORT.
* 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);