From: Sabrina Dubroca <sd@queasysnail.net>
Date: Tue, 21 Oct 2014 09:08:21 +0000 (+0200)
Subject: netfilter: nf_tables: check for NULL in nf_tables_newchain pcpu stats allocation
X-Git-Tag: v3.18-rc3~17^2~34^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c123bb7163043bb8f33858cf8e45b01c17dbd171;p=~emulex%2Finfiniband.git

netfilter: nf_tables: check for NULL in nf_tables_newchain pcpu stats allocation

alloc_percpu returns NULL on failure, not a negative error code.

Fixes: ff3cd7b3c922 ("netfilter: nf_tables: refactor chain statistic routines")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 65eb2a1160d..11ab4b078f3 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -1328,10 +1328,10 @@ static int nf_tables_newchain(struct sock *nlsk, struct sk_buff *skb,
 			basechain->stats = stats;
 		} else {
 			stats = netdev_alloc_pcpu_stats(struct nft_stats);
-			if (IS_ERR(stats)) {
+			if (stats == NULL) {
 				module_put(type->owner);
 				kfree(basechain);
-				return PTR_ERR(stats);
+				return -ENOMEM;
 			}
 			rcu_assign_pointer(basechain->stats, stats);
 		}