diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-06 17:44:28 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-06 17:44:28 +0800 |
| commit | d083f580e5b940834a93ab741cdf064f0324dc0f (patch) | |
| tree | d034075e47d68179d2f8bf7220d26bef0ba740d3 /security/selinux/hooks.c | |
| parent | 931f27c6e892fdfe98896055e0df7962e21969d9 (diff) | |
| parent | 13ff50c85846338bb9820abd3933227b678dc086 (diff) | |
Merge tag 'parse-val' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-core
regmap: Add parse_val() API
This is useful for generic code built on top of regmap dealing with
blocks of data.
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; |