hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_tables: No need to check chain existence when tracing 

nft_trace_notify() is called only from __nft_trace_packet(), which
assigns its parameter 'chain' to info->chain. __nft_trace_packet() in
turn later dereferences 'chain' unconditionally, which indicates that
it's never NULL. Same does nft_do_chain(), the only user of the tracing
infrastructure. Hence it is safe to assume the check removed here is not
needed.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Phil Sutter 2017-07-27 16:56:39 +02:00 committed by Pablo Neira Ayuso
parent 591bb2789b
commit 6e692678d7
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/netfilter/nf_tables_trace.c
View File

@ -217,14 +217,11 @@ void nft_trace_notify(struct nft_traceinfo *info)
if (trace_fill_id(skb, pkt->skb)) if (trace_fill_id(skb, pkt->skb))
goto nla_put_failure; goto nla_put_failure;
if (info->chain) { if (nla_put_string(skb, NFTA_TRACE_CHAIN, info->chain->name))
if (nla_put_string(skb, NFTA_TRACE_CHAIN, goto nla_put_failure;
info->chain->name))
goto nla_put_failure; if (nla_put_string(skb, NFTA_TRACE_TABLE, info->chain->table->name))
if (nla_put_string(skb, NFTA_TRACE_TABLE, goto nla_put_failure;
info->chain->table->name))
goto nla_put_failure;
}
if (nf_trace_fill_rule_info(skb, info)) if (nf_trace_fill_rule_info(skb, info))
goto nla_put_failure; goto nla_put_failure;