aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNetanel Belgazal <netanel@amazon.com>2018-09-09 04:15:23 -0400
committerDavid S. Miller <davem@davemloft.net>2018-09-09 10:59:55 -0400
commitfe870c77efdf8682252545cbd3d29800d8379efc (patch)
treea4eea30f5fbaf240b6527854d960a723e2abeb3d
parentcfa324a514233b28a6934de619183eee941f02d7 (diff)
net: ena: fix potential double ena_destroy_device()
ena_destroy_device() can potentially be called twice. To avoid this, check that the device is running and only then proceed destroying it. Signed-off-by: Netanel Belgazal <netanel@amazon.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/amazon/ena/ena_netdev.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index 035d47d2179a..a68c2a8d4da2 100644
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -2556,6 +2556,9 @@ static void ena_destroy_device(struct ena_adapter *adapter, bool graceful)
2556 struct ena_com_dev *ena_dev = adapter->ena_dev; 2556 struct ena_com_dev *ena_dev = adapter->ena_dev;
2557 bool dev_up; 2557 bool dev_up;
2558 2558
2559 if (!test_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags))
2560 return;
2561
2559 netif_carrier_off(netdev); 2562 netif_carrier_off(netdev);
2560 2563
2561 del_timer_sync(&adapter->timer_service); 2564 del_timer_sync(&adapter->timer_service);
@@ -2592,6 +2595,7 @@ static void ena_destroy_device(struct ena_adapter *adapter, bool graceful)
2592 adapter->reset_reason = ENA_REGS_RESET_NORMAL; 2595 adapter->reset_reason = ENA_REGS_RESET_NORMAL;
2593 2596
2594 clear_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags); 2597 clear_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags);
2598 clear_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);
2595} 2599}
2596 2600
2597static int ena_restore_device(struct ena_adapter *adapter) 2601static int ena_restore_device(struct ena_adapter *adapter)
@@ -2636,6 +2640,7 @@ static int ena_restore_device(struct ena_adapter *adapter)
2636 } 2640 }
2637 } 2641 }
2638 2642
2643 set_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);
2639 mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ)); 2644 mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));
2640 dev_err(&pdev->dev, "Device reset completed successfully\n"); 2645 dev_err(&pdev->dev, "Device reset completed successfully\n");
2641 2646