Skip to content

Commit 7c7cfdc

Browse files
ahunter6martinkpetersen
authored andcommitted
scsi: ufs: Fix NULL pointer dereference in ufshcd_config_vreg_hpm()
Fix the following BUG: [ 187.065689] BUG: kernel NULL pointer dereference, address: 000000000000001c [ 187.065790] RIP: 0010:ufshcd_vreg_set_hpm+0x3c/0x110 [ufshcd_core] [ 187.065938] Call Trace: [ 187.065959] ufshcd_resume+0x72/0x290 [ufshcd_core] [ 187.065980] ufshcd_system_resume+0x54/0x140 [ufshcd_core] [ 187.065993] ? pci_pm_restore+0xb0/0xb0 [ 187.066005] ufshcd_pci_resume+0x15/0x20 [ufshcd_pci] [ 187.066017] pci_pm_thaw+0x4c/0x90 [ 187.066030] dpm_run_callback+0x5b/0x150 [ 187.066043] device_resume+0x11b/0x220 Voltage regulators are optional, so functions must check they exist before dereferencing. Note this issue is hidden if CONFIG_REGULATORS is not set, because the offending code is optimised away. Notes for stable: The issue first appears in commit 57d104c ("ufs: add UFS power management support") but is inadvertently fixed in commit 60f0187 ("scsi: ufs: disable vccq if it's not needed by UFS device") which in turn was reverted by commit 7306798 ("Revert "scsi: ufs: disable vccq if it's not needed by UFS device""). So fix applies v3.18 to v4.5 and v5.1+ Fixes: 57d104c ("ufs: add UFS power management support") Fixes: 7306798 ("Revert "scsi: ufs: disable vccq if it's not needed by UFS device"") Cc: [email protected] Signed-off-by: Adrian Hunter <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent a86a758 commit 7c7cfdc

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/scsi/ufs/ufshcd.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7062,6 +7062,9 @@ static inline int ufshcd_config_vreg_lpm(struct ufs_hba *hba,
70627062
static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba,
70637063
struct ufs_vreg *vreg)
70647064
{
7065+
if (!vreg)
7066+
return 0;
7067+
70657068
return ufshcd_config_vreg_load(hba->dev, vreg, vreg->max_uA);
70667069
}
70677070

0 commit comments

Comments
 (0)