projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
net
/
ipv6
/
netfilter
/
ip6_queue.c
diff --git
a/net/ipv6/netfilter/ip6_queue.c
b/net/ipv6/netfilter/ip6_queue.c
index
fb80a23
..
a34c9e4
100644
(file)
--- a/
net/ipv6/netfilter/ip6_queue.c
+++ b/
net/ipv6/netfilter/ip6_queue.c
@@
-432,7
+432,7
@@
__ipq_rcv_skb(struct sk_buff *skb)
if (type <= IPQM_BASE)
return;
- if (
security_netlink_recv(skb,
CAP_NET_ADMIN))
+ if (
!capable(
CAP_NET_ADMIN))
RCV_SKB_FAIL(-EPERM);
spin_lock_bh(&queue_lock);