net: ena: fix crash during failed resume from hibernation
During resume from hibernation if ena_restore_device fails,
ena_com_dev_reset() is called, and uses the readless read mechanism,
which was already destroyed by the call to
ena_com_mmio_reg_read_request_destroy(). This causes a NULL pointer
reference.
In this commit we switch the call order of the above two functions
to avoid this crash.
Fixes: d7703ddbd7
("net: ena: fix rare bug when failed restart/resume is followed by driver removal")
Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
e1e4647984
Коммит
e76ad21d07
|
@ -2694,8 +2694,8 @@ err_device_destroy:
|
||||||
ena_com_abort_admin_commands(ena_dev);
|
ena_com_abort_admin_commands(ena_dev);
|
||||||
ena_com_wait_for_abort_completion(ena_dev);
|
ena_com_wait_for_abort_completion(ena_dev);
|
||||||
ena_com_admin_destroy(ena_dev);
|
ena_com_admin_destroy(ena_dev);
|
||||||
ena_com_mmio_reg_read_request_destroy(ena_dev);
|
|
||||||
ena_com_dev_reset(ena_dev, ENA_REGS_RESET_DRIVER_INVALID_STATE);
|
ena_com_dev_reset(ena_dev, ENA_REGS_RESET_DRIVER_INVALID_STATE);
|
||||||
|
ena_com_mmio_reg_read_request_destroy(ena_dev);
|
||||||
err:
|
err:
|
||||||
clear_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);
|
clear_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);
|
||||||
clear_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);
|
clear_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче