git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
ipv6
/
netfilter
/
ip6_queue.c
diff --git
a/net/ipv6/netfilter/ip6_queue.c
b/net/ipv6/netfilter/ip6_queue.c
index
b4b7d44
..
968a14b
100644
(file)
--- a/
net/ipv6/netfilter/ip6_queue.c
+++ b/
net/ipv6/netfilter/ip6_queue.c
@@
-505,7
+505,7
@@
ipq_rcv_skb(struct sk_buff *skb)
if (type <= IPQM_BASE)
return;
- if (security_netlink_recv(skb))
+ if (security_netlink_recv(skb
, CAP_NET_ADMIN
))
RCV_SKB_FAIL(-EPERM);
write_lock_bh(&queue_lock);