releases/4.19.9/net-ena-fix-crash-during-failed-resume-from-hibernat.patch

   1 From df97a86d22b62d7468388cfefa5be5fc854df448 Mon Sep 17 00:00:00 2001
   2 From: Arthur Kiyanovski <akiyano@amazon.com>
   3 Date: Mon, 19 Nov 2018 12:05:20 +0200
   4 Subject: net: ena: fix crash during failed resume from hibernation
   5
   6 [ Upstream commit e76ad21d070f79e566ac46ce0b0584c3c93e1b43 ]
   7
   8 During resume from hibernation if ena_restore_device fails,
   9 ena_com_dev_reset() is called, and uses the readless read mechanism,
  10 which was already destroyed by the call to
  11 ena_com_mmio_reg_read_request_destroy(). This causes a NULL pointer
  12 reference.
  13
  14 In this commit we switch the call order of the above two functions
  15 to avoid this crash.
  16
  17 Fixes: d7703ddbd7c9 ("net: ena: fix rare bug when failed restart/resume is followed by driver removal")
  18 Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
  19 Signed-off-by: David S. Miller <davem@davemloft.net>
  20 Signed-off-by: Sasha Levin <sashal@kernel.org>
  21 ---
  22  drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +-
  23  1 file changed, 1 insertion(+), 1 deletion(-)
  24
  25 diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
  26 index d906293ce07d..4b73131a0f20 100644
  27 --- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
  28 +++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
  29 @@ -2627,8 +2627,8 @@ err_device_destroy:
  30         ena_com_abort_admin_commands(ena_dev);
  31         ena_com_wait_for_abort_completion(ena_dev);
  32         ena_com_admin_destroy(ena_dev);
  33 -       ena_com_mmio_reg_read_request_destroy(ena_dev);
  34         ena_com_dev_reset(ena_dev, ENA_REGS_RESET_DRIVER_INVALID_STATE);
  35 +       ena_com_mmio_reg_read_request_destroy(ena_dev);
  36  err:
  37         clear_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);
  38         clear_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);
  39 --
  40 2.19.1
  41