diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-07-05 22:12:53 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-02 10:26:25 -0700 |
commit | e5f98e5c9f479a909d8510d46bd4874161a1c0b3 (patch) | |
tree | 7823f1560912420ccc7e4d51dad246bcbcc3032a /drivers/net | |
parent | e1d08ba9d511d0152eaa80c6a460fdbd48926e12 (diff) |
veth: Dont kfree_skb() after dev_forward_skb()
[ Upstream commit 6ec82562ffc6f297d0de36d65776cff8e5704867 ]
In case of congestion, netif_rx() frees the skb, so we must assume
dev_forward_skb() also consume skb.
Bug introduced by commit 445409602c092
(veth: move loopback logic to common location)
We must change dev_forward_skb() to always consume skb, and veth to not
double free it.
Bug report : http://marc.info/?l=linux-netdev&m=127310770900442&w=3
Reported-by: MartÃn Ferrari <martin.ferrari@gmail.com>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/veth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 3a15de56df9..baf0b514092 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -186,7 +186,6 @@ tx_drop: return NETDEV_TX_OK; rx_drop: - kfree_skb(skb); rcv_stats->rx_dropped++; return NETDEV_TX_OK; } |