diff options
| author | KY Srinivasan <kys@microsoft.com> | 2014-09-28 22:16:43 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-10-17 09:43:17 +0200 |
| commit | 4d7fe752478f96bcdf0d54d077e98733ff6a07a9 (patch) | |
| tree | ac9459977867365bab37158b4eed9bd065f80650 | |
| parent | 3473692f7cd31b6fd424fb282e12bcd94c8c6ddc (diff) | |
| download | lwn-4d7fe752478f96bcdf0d54d077e98733ff6a07a9.tar.gz lwn-4d7fe752478f96bcdf0d54d077e98733ff6a07a9.zip | |
hyperv: Fix a bug in netvsc_start_xmit()
[ Upstream commit dedb845ded56ded1c62f5398a94ffa8615d4592d ]
After the packet is successfully sent, we should not touch the skb
as it may have been freed. This patch is based on the work done by
Long Li <longli@microsoft.com>.
In this version of the patch I have fixed issues pointed out by David.
David, please queue this up for stable.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Tested-by: Long Li <longli@microsoft.com>
Tested-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index f8135725bcf6..616b4e1dd44c 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -138,6 +138,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) struct hv_netvsc_packet *packet; int ret; unsigned int i, num_pages, npg_data; + u32 skb_length = skb->len; /* Add multipages for skb->data and additional 2 for RNDIS */ npg_data = (((unsigned long)skb->data + skb_headlen(skb) - 1) @@ -208,7 +209,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net) ret = rndis_filter_send(net_device_ctx->device_ctx, packet); if (ret == 0) { - net->stats.tx_bytes += skb->len; + net->stats.tx_bytes += skb_length; net->stats.tx_packets++; } else { kfree(packet); |