projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
net
/
netfilter
/
nfnetlink.c
diff --git
a/net/netfilter/nfnetlink.c
b/net/netfilter/nfnetlink.c
index 572d87dc116ffa838d2f9f8838129156add7284e..0a03662bfbefbb41bc433999966196f38d7674bd 100644
(file)
--- a/
net/netfilter/nfnetlink.c
+++ b/
net/netfilter/nfnetlink.c
@@
-147,7
+147,7
@@
static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
const struct nfnetlink_subsystem *ss;
int type, err;
- if (!n
s_capable(net->user_ns
, CAP_NET_ADMIN))
+ if (!n
etlink_net_capable(skb
, CAP_NET_ADMIN))
return -EPERM;
/* All the messages must at least contain nfgenmsg */