Commit e711ab93 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

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



This reverts commit c7e0d6cc.

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

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

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b970afcf

security/selinux/hooks.c

+4 −4
Original line number Diff line number Diff line
@@ -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);