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

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.org


Acked-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

drivers/scsi/ufs/ufshcd.c

+14 −3
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ 
		       16, 4, buf, __len, false);                        \

} while (0)



static bool early_suspend;



int ufshcd_dump_regs(struct ufs_hba *hba, size_t offset, size_t len,

		     const char *prefix)

{
@@ -8952,8 +8954,14 @@ int ufshcd_system_suspend(struct ufs_hba *hba) 
	int ret = 0;

	ktime_t start = ktime_get();



	if (!hba) {

		early_suspend = true;

		return 0;

	}



	down(&hba->eh_sem);

	if (!hba || !hba->is_powered)



	if (!hba->is_powered)

		return 0;



	if ((ufs_get_pm_lvl_to_dev_pwr_mode(hba->spm_lvl) ==
@@ -9001,9 +9009,12 @@ int ufshcd_system_resume(struct ufs_hba *hba) 
	int ret = 0;

	ktime_t start = ktime_get();



	if (!hba) {

		up(&hba->eh_sem);

	if (!hba)

		return -EINVAL;



	if (unlikely(early_suspend)) {

		early_suspend = false;

		down(&hba->eh_sem);

	}



	if (!hba->is_powered || pm_runtime_suspended(hba->dev))