From 0b1f24e6db9a60c1f68117ad158ea29faa7c3a7f Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Tue, 3 Dec 2013 11:39:13 -0500 Subject: selinux: pull address family directly from the request_sock struct We don't need to inspect the packet to determine if the packet is an IPv4 packet arriving on an IPv6 socket when we can query the request_sock directly. Signed-off-by: Paul Moore --- security/selinux/hooks.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'security') diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index cc076a9b034..17d7689660e 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -4476,14 +4476,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; -- cgit v1.2.3-70-g09d2