]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
hyperv: Fix a bug in netvsc_start_xmit()
authorKY Srinivasan <kys@microsoft.com>
Mon, 29 Sep 2014 05:16:43 +0000 (22:16 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Sep 2014 05:21:03 +0000 (01:21 -0400)
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>
drivers/net/hyperv/netvsc_drv.c

index a9c5eaadc426b8cd93e1cacfb65142d306b22f78..0fcb5e7eb073e9eb66b2c17e53675ef87490639a 100644 (file)
@@ -387,6 +387,7 @@ static int netvsc_start_xmit(struct sk_buff *skb, struct net_device *net)
        int  hdr_offset;
        u32 net_trans_info;
        u32 hash;
+       u32 skb_length = skb->len;
 
 
        /* We will atmost need two pages to describe the rndis
@@ -562,7 +563,7 @@ do_send:
 
 drop:
        if (ret == 0) {
-               net->stats.tx_bytes += skb->len;
+               net->stats.tx_bytes += skb_length;
                net->stats.tx_packets++;
        } else {
                kfree(packet);