Skip to content

Commit

Permalink
Revert "selinux: do not report error on connect(AF_UNSPEC)"
Browse files Browse the repository at this point in the history
This reverts commit c7e0d6c.

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

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

Signed-off-by: Paolo Abeni <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
Paolo Abeni authored and davem330 committed May 10, 2019
1 parent b970afc commit e711ab9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions security/selinux/hooks.c
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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);
Expand Down

0 comments on commit e711ab9

Please sign in to comment.