summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorBen Greear <greearb@candelatech.com>2010-07-22 09:54:47 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-26 16:43:45 -0700
commit47dbdd885639768ae1889e4317f2dc0bb25cc8ac (patch)
tree63479a65e97cc158b0d62198d6031f9ef6c2fc05 /net
parent2afc67ed4d15ae5f82327aa426dfe2366d57c5e5 (diff)
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>
Diffstat (limited to 'net')
-rw-r--r--net/core/dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index ece33fd435ee..e463f77d42d2 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))) {