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

Commit Message

Paolo Abeni May 10, 2019, 9:27 a.m. UTC

This reverts commit 7301017039d68c920cb9120c035a1a0df3e6b30d.

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

Signed-off-by: Paolo Abeni <[e-mail]>
---
Note: this is targeting the 'net' tree
---
 security/selinux/hooks.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Paolo Abeni May 10, 2019, 9:33 a.m. UTC | #1

On Fri, 2019-05-10 at 11:27 +0200, Paolo Abeni wrote:
> This reverts commit 7301017039d68c920cb9120c035a1a0df3e6b30d.
> 
> It was agreed a slightly different fix via the selinux tree.
> 
> Signed-off-by: Paolo Abeni <[e-mail]>

Whoops... this references the wrong hash - the local one instead of the
'-net' tree one. I'll send a v2. I'm sorry for the noise and overhead.

Paolo

Patch

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);