diff options
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 7 | 
1 files changed, 1 insertions, 6 deletions
| diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 57b0b49f4e6..4b34847208c 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -82,7 +82,6 @@  #include <linux/syslog.h>  #include <linux/user_namespace.h>  #include <linux/export.h> -#include <linux/security.h>  #include <linux/msg.h>  #include <linux/shm.h> @@ -4490,14 +4489,10 @@ static int selinux_inet_conn_request(struct sock *sk, struct sk_buff *skb,  {  	struct sk_security_struct *sksec = sk->sk_security;  	int err; -	u16 family = sk->sk_family; +	u16 family = req->rsk_ops->family;  	u32 connsid;  	u32 peersid; -	/* handle mapped IPv4 packets arriving via IPv6 sockets */ -	if (family == PF_INET6 && skb->protocol == htons(ETH_P_IP)) -		family = PF_INET; -  	err = selinux_skb_peerlbl_sid(skb, family, &peersid);  	if (err)  		return err; | 
