OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hv_netvsc: Fix error handling in netvsc_attach() 

If rndis_filter_open() fails, we need to remove the rndis device created
in earlier steps, before returning an error code. Otherwise, the retry of
netvsc_attach() from its callers will fail and hang.

Fixes: 7b2ee50c0c ("hv_netvsc: common detach logic")
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Haiyang Zhang 2019-10-30 15:32:13 +00:00 committed by David S. Miller
parent c4509a5ac0
commit 719b85c336
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/hyperv/netvsc_drv.c
View File

@ -982,7 +982,7 @@ static int netvsc_attach(struct net_device *ndev,
if (netif_running(ndev)) { if (netif_running(ndev)) {
ret = rndis_filter_open(nvdev); ret = rndis_filter_open(nvdev);
if (ret) if (ret)
return ret; goto err;
rdev = nvdev->extension; rdev = nvdev->extension;
if (!rdev->link_state) if (!rdev->link_state)
@ -990,6 +990,13 @@ static int netvsc_attach(struct net_device *ndev,
} }
return 0; return 0;
err:
netif_device_detach(ndev);
rndis_filter_device_remove(hdev, nvdev);
return ret;
} }
static int netvsc_set_channels(struct net_device *net, static int netvsc_set_channels(struct net_device *net,