Commit e1f1bd9b authored by Arthur Kiyanovski's avatar Arthur Kiyanovski Committed by David S. Miller

net: ena: fix race between link up and device initalization

Fix race condition between ena_update_on_link_change() and
ena_restore_device().

This race can occur if link notification arrives while the driver
is performing a reset sequence. In this case link can be set up,
enabling the device, before it is fully restored. If packets are
sent at this time, the driver might access uninitialized data
structures, causing kernel crash.

Move the clearing of ENA_FLAG_ONGOING_RESET and netif_carrier_on()
after ena_up() to ensure the device is ready when link is set up.

Fixes: d18e4f68 ("net: ena: fix race condition between device reset and link up setup")
Signed-off-by: default avatarArthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc62814d
...@@ -2663,11 +2663,6 @@ static int ena_restore_device(struct ena_adapter *adapter) ...@@ -2663,11 +2663,6 @@ static int ena_restore_device(struct ena_adapter *adapter)
goto err_device_destroy; goto err_device_destroy;
} }
clear_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);
/* Make sure we don't have a race with AENQ Links state handler */
if (test_bit(ENA_FLAG_LINK_UP, &adapter->flags))
netif_carrier_on(adapter->netdev);
rc = ena_enable_msix_and_set_admin_interrupts(adapter, rc = ena_enable_msix_and_set_admin_interrupts(adapter,
adapter->num_queues); adapter->num_queues);
if (rc) { if (rc) {
...@@ -2684,6 +2679,11 @@ static int ena_restore_device(struct ena_adapter *adapter) ...@@ -2684,6 +2679,11 @@ static int ena_restore_device(struct ena_adapter *adapter)
} }
set_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags); set_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);
clear_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);
if (test_bit(ENA_FLAG_LINK_UP, &adapter->flags))
netif_carrier_on(adapter->netdev);
mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ)); mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Device reset completed successfully, Driver info: %s\n", "Device reset completed successfully, Driver info: %s\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment