Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

[mirror_ubuntu-zesty-kernel.git] / net / ipv4 / netfilter / ip_queue.c

diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index a057fe64debde83a8b2fe1d29a78d7eb00954e8b..94d45e1f8882558ae45575ee7723f5aacd6022d9 100644 (file)
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -431,7 +431,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);