X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=security%2Fselinux%2Fhooks.c;h=4b34847208cc9690284e9e7c7b6f9a960cfbead3;hb=41be702a542a0d14bb0b1c16e824fa9ed27616ec;hp=57b0b49f4e6e23a9c6dd974e3f9dd78664f1f59a;hpb=d8ec26d7f8287f5788a494f56e8814210f0e64be;p=cascardo%2Flinux.git

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 57b0b49f4e6e..4b34847208cc 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;