diff options
| author |   Igor Russkikh <igor.russkikh@aquantia.com> | 2018-04-11 15:23:25 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-04-11 10:41:36 -0400 |
| commit | 9a11aff25fd43d5bd2660ababdc9f564b0ba183a (patch) | |
| tree | 89326f75b28fd9cbc9bae684c1fe9c22915825f4 /drivers/net | |
| parent | net: aquantia: Regression on reset with 1.x firmware (diff) | |
| download | linux-dev-9a11aff25fd43d5bd2660ababdc9f564b0ba183a.tar.xz linux-dev-9a11aff25fd43d5bd2660ababdc9f564b0ba183a.zip | |
net: aquantia: oops when shutdown on already stopped device
In case netdev is closed at the moment of pci shutdown, aq_nic_stop
gets called second time. napi_disable in that case hangs indefinitely.
In other case, if device was never opened at all, we get oops because
of null pointer access.
We should invoke aq_nic_stop conditionally, only if device is running
at the moment of shutdown.
Reported-by: David Arcari <darcari@redhat.com>
Fixes: 90869ddfefeb ("net: aquantia: Implement pci shutdown callback")
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index c96a92118b8b..32f6d2e24d66 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -951,9 +951,11 @@ void aq_nic_shutdown(struct aq_nic_s *self) netif_device_detach(self->ndev); - err = aq_nic_stop(self); - if (err < 0) - goto err_exit; + if (netif_running(self->ndev)) { + err = aq_nic_stop(self); + if (err < 0) + goto err_exit; + } aq_nic_deinit(self); err_exit: |