]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
netfilter: nfnetlink_log: Use GFP_NOWARN for skb allocation
authorCalvin Owens <calvinowens@fb.com>
Fri, 7 Oct 2016 21:02:16 +0000 (14:02 -0700)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 26 Oct 2016 14:35:15 +0000 (16:35 +0200)
Since the code explicilty falls back to a smaller allocation when the
large one fails, we shouldn't complain when that happens.

Signed-off-by: Calvin Owens <calvinowens@fb.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/nfnetlink_log.c

index eb086a192c5a0d8c0f64bbe0c52818b8afe4fa90..7435505037b7a509081826add82060ee2dfa587c 100644 (file)
@@ -330,7 +330,7 @@ nfulnl_alloc_skb(struct net *net, u32 peer_portid, unsigned int inst_size,
         * message.  WARNING: has to be <= 128k due to slab restrictions */
 
        n = max(inst_size, pkt_size);
-       skb = alloc_skb(n, GFP_ATOMIC);
+       skb = alloc_skb(n, GFP_ATOMIC | __GFP_NOWARN);
        if (!skb) {
                if (n > pkt_size) {
                        /* try to allocate only as much as we need for current