aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy2013-04-05 13:42:05 -0500
committerGreg Kroah-Hartman2013-05-01 11:46:17 -0500
commit1f451b69be3f3705018b314be47c832e5a53a1f6 (patch)
tree93492f82009007e768193087f2ba123b13a533e1 /net
parentbb85e599d460dc0e59b17abe8e6a906c5d7bcfae (diff)
downloadkernel-video-1f451b69be3f3705018b314be47c832e5a53a1f6.tar.gz
kernel-video-1f451b69be3f3705018b314be47c832e5a53a1f6.tar.xz
kernel-video-1f451b69be3f3705018b314be47c832e5a53a1f6.zip
netfilter: don't reset nf_trace in nf_reset()
[ Upstream commit 124dff01afbdbff251f0385beca84ba1b9adda68 ] Commit 130549fe ("netfilter: reset nf_trace in nf_reset") added code to reset nf_trace in nf_reset(). This is wrong and unnecessary. nf_reset() is used in the following cases: - when passing packets up the the socket layer, at which point we want to release all netfilter references that might keep modules pinned while the packet is queued. nf_trace doesn't matter anymore at this point. - when encapsulating or decapsulating IPsec packets. We want to continue tracing these packets after IPsec processing. - when passing packets through virtual network devices. Only devices on that encapsulate in IPv4/v6 matter since otherwise nf_trace is not used anymore. Its not entirely clear whether those packets should be traced after that, however we've always done that. - when passing packets through virtual network devices that make the packet cross network namespace boundaries. This is the only cases where we clearly want to reset nf_trace and is also what the original patch intended to fix. Add a new function nf_reset_trace() and use it in dev_forward_skb() to fix this properly. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 5d9c43dca73..28b6f97c340 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1737,6 +1737,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
1737 skb->mark = 0; 1737 skb->mark = 0;
1738 secpath_reset(skb); 1738 secpath_reset(skb);
1739 nf_reset(skb); 1739 nf_reset(skb);
1740 nf_reset_trace(skb);
1740 return netif_rx(skb); 1741 return netif_rx(skb);
1741} 1742}
1742EXPORT_SYMBOL_GPL(dev_forward_skb); 1743EXPORT_SYMBOL_GPL(dev_forward_skb);