diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-08-05 11:25:59 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-08-08 09:38:50 -0400 |
commit | b88825de8545ad252c31543fef13cadf4de7a2bc (patch) | |
tree | efda3574e66870d16818e423e4587c5f784bcfaf | |
parent | a3716e70e1def691ad39e0f908fea0870ce010d9 (diff) |
netfilter: nf_tables: don't update chain with unset counters
Fix possible replacement of the per-cpu chain counters by null
pointer when updating an existing chain in the commit path.
Reported-by: Matteo Croce <technoboy85@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r-- | net/netfilter/nf_tables_api.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index c6f9d3d18ed1..9aa31f11056d 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) | |||
899 | static void nft_chain_stats_replace(struct nft_base_chain *chain, | 899 | static void nft_chain_stats_replace(struct nft_base_chain *chain, |
900 | struct nft_stats __percpu *newstats) | 900 | struct nft_stats __percpu *newstats) |
901 | { | 901 | { |
902 | if (newstats == NULL) | ||
903 | return; | ||
904 | |||
902 | if (chain->stats) { | 905 | if (chain->stats) { |
903 | struct nft_stats __percpu *oldstats = | 906 | struct nft_stats __percpu *oldstats = |
904 | nft_dereference(chain->stats); | 907 | nft_dereference(chain->stats); |