| Date | Tue, 24 Aug 2010 15:42:18 -0700 | From | Greg KH <> | Subject | [56/91] net: dev_forward_skb should call nf_reset |
| |
2.6.34-stable review patch. If anyone has any objections, please let us know.
------------------
From: Ben Greear <greearb@candelatech.com>
[ 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> --- net/core/dev.c | 1 + 1 file changed, 1 insertion(+)
--- a/net/core/dev.c +++ b/net/core/dev.c @@ -1464,6 +1464,7 @@ static inline void net_timestamp(struct 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))) {
|