]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
hv_netvsc: disable NAPI before channel close
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 20 Mar 2018 22:03:02 +0000 (15:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 Mar 2018 16:45:09 +0000 (12:45 -0400)
This makes sure that no CPU is still process packets when
the channel is closed.

Fixes: 76bb5db5c749 ("netvsc: fix use after free on module removal")
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/hyperv/netvsc.c

index 0265d703eb030515dacab7a83e84c169f89250dd..e70a44273f55421da0dbcee62e39b9af4a9f8e64 100644 (file)
@@ -568,6 +568,10 @@ void netvsc_device_remove(struct hv_device *device)
 
        RCU_INIT_POINTER(net_device_ctx->nvdev, NULL);
 
+       /* And disassociate NAPI context from device */
+       for (i = 0; i < net_device->num_chn; i++)
+               netif_napi_del(&net_device->chan_table[i].napi);
+
        /*
         * At this point, no one should be accessing net_device
         * except in here
@@ -579,10 +583,6 @@ void netvsc_device_remove(struct hv_device *device)
 
        netvsc_teardown_gpadl(device, net_device);
 
-       /* And dissassociate NAPI context from device */
-       for (i = 0; i < net_device->num_chn; i++)
-               netif_napi_del(&net_device->chan_table[i].napi);
-
        /* Release all resources */
        free_netvsc_device_rcu(net_device);
 }