diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-22 04:36:33 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-22 04:36:33 +0400 |
| commit | 03c1b4e8e560455a2634a76998883a22f1a01207 (patch) | |
| tree | 30ca1237d094d66df1dc1533f7bf39b3877b5932 /net/netfilter/nfnetlink.c | |
| parent | ac49b9a9f26b6c42585f87857722085ef4b19c13 (diff) | |
| parent | e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4 (diff) | |
| download | linux-03c1b4e8e560455a2634a76998883a22f1a01207.tar.xz | |
Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso
Merge x86/espfix into x86/vdso, due to changes in the vdso setup code
that otherwise cause conflicts.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'net/netfilter/nfnetlink.c')
| -rw-r--r-- | net/netfilter/nfnetlink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index e8138da4c14f..e009087620e3 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -368,14 +368,13 @@ done: static void nfnetlink_rcv(struct sk_buff *skb) { struct nlmsghdr *nlh = nlmsg_hdr(skb); - struct net *net = sock_net(skb->sk); int msglen; if (nlh->nlmsg_len < NLMSG_HDRLEN || skb->len < nlh->nlmsg_len) return; - if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) { + if (!netlink_net_capable(skb, CAP_NET_ADMIN)) { netlink_ack(skb, nlh, -EPERM); return; } |