summaryrefslogtreecommitdiffstats
path: root/net/ipv4/ip_output.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2014-02-15 23:48:45 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-02-17 11:20:12 +0100
commit478b360a47b71f3b5030eacd3aae6acb1a32c2b6 (patch)
tree62451e529b258898c690ca2ad7d0e134745f1a6f /net/ipv4/ip_output.c
parent2b7a79bae2dc0327af2352e1d1793b9d752648aa (diff)
downloadop-kernel-dev-478b360a47b71f3b5030eacd3aae6acb1a32c2b6.zip
op-kernel-dev-478b360a47b71f3b5030eacd3aae6acb1a32c2b6.tar.gz
netfilter: nf_tables: fix nf_trace always-on with XT_TRACE=n
When using nftables with CONFIG_NETFILTER_XT_TARGET_TRACE=n, we get lots of "TRACE: filter:output:policy:1 IN=..." warnings as several places will leave skb->nf_trace uninitialised. Unlike iptables tracing functionality is not conditional in nftables, so always copy/zero nf_trace setting when nftables is enabled. Move this into __nf_copy() helper. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r--net/ipv4/ip_output.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 8971780..73c6b63 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -422,9 +422,6 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
to->tc_index = from->tc_index;
#endif
nf_copy(to, from);
-#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
- to->nf_trace = from->nf_trace;
-#endif
#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
to->ipvs_property = from->ipvs_property;
#endif
OpenPOWER on IntegriCloud