summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorPaolo Abeni <pabeni@redhat.com>2019-05-10 11:37:58 +0200
committerDavid S. Miller <davem@davemloft.net>2019-05-10 09:34:31 -0700
commite711ab936a44ee9f63f1746c09029543f1b29dd2 (patch)
treeb0b35eb0f559eb319863da857f1dfc4ff1df1075 /security
parentb970afcfcabd63cd3832e95db096439c177c3592 (diff)
downloadlinux-e711ab936a44ee9f63f1746c09029543f1b29dd2.tar.gz
linux-e711ab936a44ee9f63f1746c09029543f1b29dd2.tar.bz2
linux-e711ab936a44ee9f63f1746c09029543f1b29dd2.zip
Revert "selinux: do not report error on connect(AF_UNSPEC)"
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>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/hooks.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d82b87c16b0a..c61787b15f27 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -4649,7 +4649,7 @@ static int selinux_socket_connect_helper(struct socket *sock,
struct lsm_network_audit net = {0,};
struct sockaddr_in *addr4 = NULL;
struct sockaddr_in6 *addr6 = NULL;
- unsigned short snum = 0;
+ unsigned short snum;
u32 sid, perm;
/* sctp_connectx(3) calls via selinux_sctp_bind_connect()
@@ -4674,12 +4674,12 @@ static int selinux_socket_connect_helper(struct socket *sock,
break;
default:
/* Note that SCTP services expect -EINVAL, whereas
- * others must handle this at the protocol level:
- * connect(AF_UNSPEC) on a connected socket is
- * a documented way disconnect the socket.
+ * others expect -EAFNOSUPPORT.
*/
if (sksec->sclass == SECCLASS_SCTP_SOCKET)
return -EINVAL;
+ else
+ return -EAFNOSUPPORT;
}
err = sel_netport_sid(sk->sk_protocol, snum, &sid);