From: Gao feng <gaofeng@cn.fujitsu.com>
Date: Thu, 21 Mar 2013 19:48:41 +0000 (+0000)
Subject: netfilter: reset nf_trace in nf_reset
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=130549fed828cc34c22624c6195afcf9e7ae56fe;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

netfilter: reset nf_trace in nf_reset

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>
---

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 441f5bfdab8..72b396751de 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. */