X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=security%2Fselinux%2Fhooks.c;fp=security%2Fselinux%2Fhooks.c;h=3219560f9fae17598dde8bc70285f2fb1846e63a;hb=d4a82a4a033d563f1dc2c944eec2358cb38432d0;hp=6625699f497c7f3889f7b82b325a315c9e51774a;hpb=5f64822d63efa20cee9efe8766b3a62ab6a1f6c3;p=~andy%2Flinux

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 6625699f497..3219560f9fa 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>
 
@@ -4474,14 +4473,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;