hv_netvsc: Fix race of register_netdevice_notifier and VF register

commit 85520856466ed6bc3b1ccb013cddac70ceb437db upstream.

If VF NIC is registered earlier, NETDEV_REGISTER event is replayed,
but NETDEV_POST_INIT is not.

Move register_netdevice_notifier() earlier, so the call back
function is set before probing.

Cc: stable@vger.kernel.org
Fixes: e04e7a7bbd4b ("hv_netvsc: Fix a deadlock by getting rtnl lock earlier in netvsc_probe()")
Reported-by: Dexuan Cui <decui@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: Dexuan Cui <decui@microsoft.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c
index ec622e909a6851f21bad2646c3e6e6a786c89783..f35d1158ca783c0122b6dad434681da3a8e68dc7 100644 (file)
--- a/drivers/net/hyperv/netvsc_drv.c
+++ b/drivers/net/hyperv/netvsc_drv.c
@@ -2807,12 +2807,17 @@ static int __init netvsc_drv_init(void)
        }
        netvsc_ring_bytes = ring_size * PAGE_SIZE;
 
+       register_netdevice_notifier(&netvsc_netdev_notifier);
+
        ret = vmbus_driver_register(&netvsc_drv);
        if (ret)
-               return ret;
+               goto err_vmbus_reg;
 
-       register_netdevice_notifier(&netvsc_netdev_notifier);
        return 0;
+
+err_vmbus_reg:
+       unregister_netdevice_notifier(&netvsc_netdev_notifier);
+       return ret;
 }
 
 MODULE_LICENSE("GPL");