[PATCH net 17/18] net/ena: fix NULL dereference when removing the driver after device reset faild

From: Netanel Belgazal
Date: Sun Nov 20 2016 - 03:46:40 EST

If for some reason the device stop responding and the device reset failed
to recover the device, the mmio register read datastructure will not be
On driver removal, the driver will also tries to reset the device
but this time the mmio data structure will be NULL.

To solve this issue perform the device reset in the remove function only if
the device is runnig.

Signed-off-by: Netanel Belgazal <netanel@xxxxxxxxxxxxxxxxx>
drivers/net/ethernet/amazon/ena/ena_netdev.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index ba395aa..12d1dca 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -2591,6 +2591,8 @@ static void ena_fw_reset_device(struct work_struct *work)

+ clear_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);
"Reset attempt failed. Can not reset the device\n");
@@ -3251,7 +3253,9 @@ static void ena_remove(struct pci_dev *pdev)


- ena_com_dev_reset(ena_dev);
+ /* Reset the device only if the device is running. */
+ if (test_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags))
+ ena_com_dev_reset(ena_dev);