diff mbox

[6/6,-stable] netfilter: nf_tables: don't update chain with unset counters

Message ID 1411731824-15051-7-git-send-email-pablo@netfilter.org
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Pablo Neira Ayuso Sept. 26, 2014, 11:43 a.m. UTC 
[ upstream commit b88825de8545ad252c31543fef13cadf4de7a2bc ]

Fix possible replacement of the per-cpu chain counters by null
pointer when updating an existing chain in the commit path.

Cc: <stable@vger.kernel.org> # 3.16.x
Reported-by: Matteo Croce <technoboy85@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/netfilter/nf_tables_api.c |    3 +++
 1 file changed, 3 insertions(+)
diff mbox

Patch

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index c6f9d3d..9aa31f1 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -899,6 +899,9 @@  static struct nft_stats __percpu *nft_stats_alloc(const struct nlattr *attr)
 static void nft_chain_stats_replace(struct nft_base_chain *chain,
 				    struct nft_stats __percpu *newstats)
 {
+	if (newstats == NULL)
+		return;
+
 	if (chain->stats) {
 		struct nft_stats __percpu *oldstats =
 				nft_dereference(chain->stats);