Skip to content

Commit

Permalink
net: ena: fix missing lock during device destruction
Browse files Browse the repository at this point in the history
acquire the rtnl_lock during device destruction to avoid
using partially destroyed device.

ena_remove() shares almost the same logic as ena_destroy_device(),
so use ena_destroy_device() and avoid duplications.

Signed-off-by: Netanel Belgazal <netanel@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Netanel Belgazal authored and David S. Miller committed Sep 9, 2018
1 parent fe870c7 commit 944b28a
Showing 1 changed file with 7 additions and 13 deletions.
20 changes: 7 additions & 13 deletions drivers/net/ethernet/amazon/ena/ena_netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -3421,24 +3421,18 @@ static void ena_remove(struct pci_dev *pdev)

unregister_netdev(netdev);

/* Reset the device only if the device is running. */
/* If the device is running then we want to make sure the device will be
* reset to make sure no more events will be issued by the device.
*/
if (test_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags))
ena_com_dev_reset(ena_dev, adapter->reset_reason);

ena_free_mgmnt_irq(adapter);
set_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags);

ena_disable_msix(adapter);
rtnl_lock();
ena_destroy_device(adapter, true);
rtnl_unlock();

free_netdev(netdev);

ena_com_mmio_reg_read_request_destroy(ena_dev);

ena_com_abort_admin_commands(ena_dev);

ena_com_wait_for_abort_completion(ena_dev);

ena_com_admin_destroy(ena_dev);

ena_com_rss_destroy(ena_dev);

ena_com_delete_debug_area(ena_dev);
Expand Down

0 comments on commit 944b28a

Please sign in to comment.