Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 997d895f authored by Haiyang Zhang's avatar Haiyang Zhang Committed by Greg Kroah-Hartman
Browse files

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: e04e7a7b ("hv_netvsc: Fix a deadlock by getting rtnl lock earlier in netvsc_probe()")
Reported-by: default avatarDexuan Cui <decui@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Reviewed-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: default avatarDexuan Cui <decui@microsoft.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2a0c988
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -2528,12 +2528,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");