netfilter: nf_tables: do not dump chain counters if not enabled

ummakynes · ummakynes · commit 5f9bfe0ef622 · 2017-10-06T14:49:19.000+02:00
Chain counters are only enabled on demand since 9f08ea8, skip them when dumping them via netlink. Fixes: 9f08ea8 ("netfilter: nf_tables: keep chain counters away from hot path") Reported-by: Johny Mattsson <johny.mattsson+kernel@gmail.com> Tested-by: Johny Mattsson <johny.mattsson+kernel@gmail.com> 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
@@ -1048,7 +1048,7 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, struct net *net,
 		if (nla_put_string(skb, NFTA_CHAIN_TYPE, basechain->type->name))
 			goto nla_put_failure;
 
-		if (nft_dump_stats(skb, nft_base_chain(chain)->stats))
+		if (basechain->stats && nft_dump_stats(skb, basechain->stats))
 			goto nla_put_failure;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1048,7 +1048,7 @@ static int nf_tables_fill_chain_info(struct sk_buff skb, struct net net,`
`1048`	`1048`	`if (nla_put_string(skb, NFTA_CHAIN_TYPE, basechain->type->name))`
`1049`	`1049`	`goto nla_put_failure;`
`1050`	`1050`
`1051`		`- if (nft_dump_stats(skb, nft_base_chain(chain)->stats))`
	`1051`	`+ if (basechain->stats && nft_dump_stats(skb, basechain->stats))`
`1052`	`1052`	`goto nla_put_failure;`
`1053`	`1053`	`}`
`1054`	`1054`