Patchwork [1/5] netfilter: reset nf_trace in nf_reset

login
register
mail settings
Submitter Pablo Neira
Date April 4, 2013, 12:56 p.m.
Message ID <1365080169-6880-2-git-send-email-pablo@netfilter.org>
Download mbox | patch
Permalink /patch/233763/
State Accepted
Headers show

Comments

Pablo Neira - April 4, 2013, 12:56 p.m.
From: Gao feng <gaofeng@cn.fujitsu.com>

We forgot to clear the nf_trace of sk_buff in nf_reset,
When we use veth device, this nf_trace information will
be leaked from one net namespace to another net namespace.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 include/linux/skbuff.h |    3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 441f5bf..72b3967 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2641,6 +2641,9 @@  static inline void nf_reset(struct sk_buff *skb)
 	nf_bridge_put(skb->nf_bridge);
 	skb->nf_bridge = NULL;
 #endif
+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
+	skb->nf_trace = 0;
+#endif
 }
 
 /* Note: This doesn't put any conntrack and bridge info in dst. */