From: Ben Greear <greearb@candelatech.com>
Date: Thu, 22 Jul 2010 09:54:47 +0000 (+0000)
Subject: net: dev_forward_skb should call nf_reset
X-Git-Tag: v2.6.34.6~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=47dbdd885639768ae1889e4317f2dc0bb25cc8ac;p=thirdparty%2Fkernel%2Fstable.git

net: dev_forward_skb should call nf_reset

[ Upstream commit c736eefadb71a01a5e61e0de700f28f6952b4444 ]

With conn-track zones and probably with different network
namespaces, the netfilter logic needs to be re-calculated
on packet receive.  If the netfilter logic is not reset,
it will not be recalculated properly.  This patch adds
the nf_reset logic to dev_forward_skb.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/core/dev.c b/net/core/dev.c
index ece33fd435eee..e463f77d42d23 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1464,6 +1464,7 @@ static inline void net_timestamp(struct sk_buff *skb)
 int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
 {
 	skb_orphan(skb);
+	nf_reset(skb);
 
 	if (!(dev->flags & IFF_UP) ||
 	    (skb->len > (dev->mtu + dev->hard_header_len))) {