diff options
| author |   Netanel Belgazal <netanel@amazon.com> | 2018-09-09 08:15:20 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-09-09 07:59:55 -0700 |
| commit | 772ed869f535b4ec2b134645c951ff22de4d3f79 (patch) | |
| tree | e526e8e2408f0903e29796653bbf2d569f5adc5b /drivers/net/ethernet/amazon | |
| parent | tcp: really ignore MSG_ZEROCOPY if no SO_ZEROCOPY (diff) | |
| download | linux-dev-772ed869f535b4ec2b134645c951ff22de4d3f79.tar.xz linux-dev-772ed869f535b4ec2b134645c951ff22de4d3f79.zip | |
net: ena: fix surprise unplug NULL dereference kernel crash
Starting with driver version 1.5.0, in case of a surprise device
unplug, there is a race caused by invoking ena_destroy_device()
from two different places. As a result, the readless register might
be accessed after it was destroyed.
Signed-off-by: Netanel Belgazal <netanel@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amazon')
| -rw-r--r-- | drivers/net/ethernet/amazon/ena/ena_netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c index c673ac2df65b..170830b807fe 100644 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c @@ -3409,12 +3409,12 @@ static void ena_remove(struct pci_dev *pdev) netdev->rx_cpu_rmap = NULL; } #endif /* CONFIG_RFS_ACCEL */ - - unregister_netdev(netdev); del_timer_sync(&adapter->timer_service); cancel_work_sync(&adapter->reset_task); + unregister_netdev(netdev); + /* Reset the device only if the device is running. */ if (test_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags)) ena_com_dev_reset(ena_dev, adapter->reset_reason); |