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

Commit 692e084e authored by Haiyang Zhang's avatar Haiyang Zhang Committed by Greg Kroah-Hartman
Browse files

staging: hv: re-order the code in netvsc_probe() 



Re-order the code in netvsc_probe() to prevent a guest crash caused by
packets possibly received from NetVSP before call to register_netdev().

Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c4b6a2ea

drivers/staging/hv/netvsc_drv.c

+17 −15
Original line number Original line Diff line number Diff line
@@ -348,19 +348,6 @@ static int netvsc_probe(struct hv_device *dev) 
	dev_set_drvdata(&dev->device, net);

	dev_set_drvdata(&dev->device, net);

	INIT_DELAYED_WORK(&net_device_ctx->dwork, netvsc_send_garp);

	INIT_DELAYED_WORK(&net_device_ctx->dwork, netvsc_send_garp);





	/* Notify the netvsc driver of the new device */

	device_info.ring_size = ring_size;

	ret = rndis_filter_device_add(dev, &device_info);

	if (ret != 0) {

		free_netdev(net);

		dev_set_drvdata(&dev->device, NULL);

		return ret;

	}



	netif_carrier_on(net);



	memcpy(net->dev_addr, device_info.mac_adr, ETH_ALEN);



	net->netdev_ops = &device_ops;

	net->netdev_ops = &device_ops;





	/* TODO: Add GSO and Checksum offload */

	/* TODO: Add GSO and Checksum offload */
@@ -372,11 +359,26 @@ static int netvsc_probe(struct hv_device *dev) 




	ret = register_netdev(net);

	ret = register_netdev(net);

	if (ret != 0) {

	if (ret != 0) {

		/* Remove the device and release the resource */

		pr_err("Unable to register netdev.\n");

		rndis_filter_device_remove(dev);

		free_netdev(net);

		free_netdev(net);

		goto out;

	}

	}





	/* Notify the netvsc driver of the new device */

	device_info.ring_size = ring_size;

	ret = rndis_filter_device_add(dev, &device_info);

	if (ret != 0) {

		netdev_err(net, "unable to add netvsc device (ret %d)\n", ret);

		unregister_netdev(net);

		free_netdev(net);

		dev_set_drvdata(&dev->device, NULL);

		return ret;

	}

	memcpy(net->dev_addr, device_info.mac_adr, ETH_ALEN);



	netif_carrier_on(net);



out:

	return ret;

	return ret;

}

}