Commit fb7afe24 authored by Can Guo's avatar Can Guo Committed by Martin K. Petersen

scsi: ufs: Fix a possible NULL pointer issue

During system resume/suspend, hba could be NULL. In this case, do not touch
eh_sem.

Fixes: 88a92d6a ("scsi: ufs: Serialize eh_work with system PM events and async scan")
Link: https://lore.kernel.org/r/1610594010-7254-2-git-send-email-cang@codeaurora.orgAcked-by: default avatarStanley Chu <stanley.chu@mediatek.com>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e8e5df5e
...@@ -95,6 +95,8 @@ ...@@ -95,6 +95,8 @@
16, 4, buf, __len, false); \ 16, 4, buf, __len, false); \
} while (0) } while (0)
static bool early_suspend;
int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len, int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len,
const char *prefix) const char *prefix)
{ {
...@@ -8952,8 +8954,14 @@ int ufshcd_system_suspend(struct ufs_hba *hba) ...@@ -8952,8 +8954,14 @@ int ufshcd_system_suspend(struct ufs_hba *hba)
int ret = 0; int ret = 0;
ktime_t start = ktime_get(); ktime_t start = ktime_get();
if (!hba) {
early_suspend = true;
return 0;
}
down(&hba->eh_sem); down(&hba->eh_sem);
if (!hba || !hba->is_powered)
if (!hba->is_powered)
return 0; return 0;
if ((ufs_get_pm_lvl_to_dev_pwr_mode(hba->spm_lvl) == if ((ufs_get_pm_lvl_to_dev_pwr_mode(hba->spm_lvl) ==
...@@ -9001,9 +9009,12 @@ int ufshcd_system_resume(struct ufs_hba *hba) ...@@ -9001,9 +9009,12 @@ int ufshcd_system_resume(struct ufs_hba *hba)
int ret = 0; int ret = 0;
ktime_t start = ktime_get(); ktime_t start = ktime_get();
if (!hba) { if (!hba)
up(&hba->eh_sem);
return -EINVAL; return -EINVAL;
if (unlikely(early_suspend)) {
early_suspend = false;
down(&hba->eh_sem);
} }
if (!hba->is_powered || pm_runtime_suspended(hba->dev)) if (!hba->is_powered || pm_runtime_suspended(hba->dev))
......
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