shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

BACKPORT: FROMGIT: scsi: ufs: Fix a possible NULL pointer issue

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

Fixes: 88a92d6ae4 ("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: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Bug: 189457922
(cherry picked from commit fb7afe24ba
git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git 5.14/scsi-queue)
[Can Guo: Resolved minor conflict in ufshcd.c]
Change-Id: I7c2cfaf95b8e24529929377096b882cad4fe3c35
Signed-off-by: Can Guo <cang@codeaurora.org>
This commit is contained in:
Can Guo
2021-01-13 19:13:27 -08:00
committed by Greg Kroah-Hartman
parent a0b04503a2
commit 22bc7e38f1
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/scsi/ufs/ufshcd.c
View File

@@ -98,6 +98,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)
{ {
@@ -8907,8 +8909,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;
cancel_delayed_work_sync(&hba->rpm_dev_flush_recheck_work); cancel_delayed_work_sync(&hba->rpm_dev_flush_recheck_work);
@@ -8960,9 +8968,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))