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>

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index d82b87c16b0abb3cae919aaf8b5f28a56faad170..c61787b15f27b2b0bd0ed7d448fd6ba2d73ca07a 100644 (file)
--- 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);