diff options
| author | Haiyang Zhang <haiyangz@microsoft.com> | 2019-10-30 15:32:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-10-30 18:17:36 -0700 |
| commit | 719b85c336ed35565d0f3982269d6f684087bb00 (patch) | |
| tree | f08ae7bc835932ecc0392bb56b16af8663ecde00 | |
| parent | c4509a5ac0ace94d5b1f0092dc4d36933c1d896e (diff) | |
| download | linux-719b85c336ed35565d0f3982269d6f684087bb00.tar.bz2 | |
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: 7b2ee50c0cd5 ("hv_netvsc: common detach logic")
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/hyperv/netvsc_drv.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index bab7c1f84dfd..963509add611 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -982,7 +982,7 @@ static int netvsc_attach(struct net_device *ndev, if (netif_running(ndev)) { ret = rndis_filter_open(nvdev); if (ret) - return ret; + goto err; rdev = nvdev->extension; if (!rdev->link_state) @@ -990,6 +990,13 @@ static int netvsc_attach(struct net_device *ndev, } return 0; + +err: + netif_device_detach(ndev); + + rndis_filter_device_remove(hdev, nvdev); + + return ret; } static int netvsc_set_channels(struct net_device *net, |