[PATCH V3] scsi: ufs: qcom : Fix NULL pointer dereference in ufs_qcom_setup_clocks

[PATCH V3] scsi: ufs: qcom : Fix NULL pointer dereference in ufs_qcom_setup_clocks

[Nitin Rawat]

Fix a NULL pointer dereference in ufs_qcom_setup_clocks due to an
uninitialized 'host' variable. The variable 'phy' is now assigned
after confirming 'host' is not NULL.

Call Stack:

Unable to handle kernel NULL pointer dereference at
virtual address 0000000000000000

ufs_qcom_setup_clocks+0x28/0x148 ufs_qcom (P)
ufshcd_setup_clocks (drivers/ufs/core/ufshcd-priv.h:142)
ufshcd_init (drivers/ufs/core/ufshcd.c:9468)
ufshcd_pltfrm_init (drivers/ufs/host/ufshcd-pltfrm.c:504)
ufs_qcom_probe+0x28/0x68 ufs_qcom
platform_probe (drivers/base/platform.c:1404)
really_probe (drivers/base/dd.c:579 drivers/base/dd.c:657)
__driver_probe_device (drivers/base/dd.c:799)
driver_probe_device (drivers/base/dd.c:829)
__driver_attach (drivers/base/dd.c:1216)
bus_for_each_dev (drivers/base/bus.c:370)
driver_attach (drivers/base/dd.c:1234)
bus_add_driver (drivers/base/bus.c:678)
driver_register (drivers/base/driver.c:249)
__platform_driver_register (drivers/base/platform.c:868)
ufs_qcom_pltform_init+0x28/0xff8 ufs_qcom
do_one_initcall (init/main.c:1274)
do_init_module (kernel/module/main.c:3041)
load_module (kernel/module/main.c:3511)
init_module_from_file (kernel/module/main.c:3704)
__arm64_sys_finit_module (kernel/module/main.c:3715.

Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Fixes: 77d2fa54a945 ("scsi: ufs: qcom : Refactor phy_power_on/off calls")
Tested-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Tested-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Tested-by: Neil Armstrong <neil.armstrong@linaro.org>
Reported-by: Aishwarya <aishwarya.tcv@arm.com>
Closes: https://lore.kernel.org/lkml/20250620214408.11028-1-aishwarya.tcv@arm.com/
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Closes: https://lore.kernel.org/linux-scsi/CA+G9fYuFQ2dBvYm1iB6rbwT=4b1c8e4NJ3yxqFPGZGUKH3GmMA@mail.gmail.com/T/#t
Co-developed-by: Ram Kumar Dwivedi <quic_rdwivedi@quicinc.com>
Signed-off-by: Ram Kumar Dwivedi <quic_rdwivedi@quicinc.com>
Signed-off-by: Nitin Rawat <quic_nitirawa@quicinc.com>
---
Changes from v2:
1. Added tested-by and reviewed-by tag.

Changes from v1:
1. Addressed Manivannan's and Dmitry's comment to modify commit text.

---
 drivers/ufs/host/ufs-qcom.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index ba4b2880279c..318dca7fe3d7 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1124,7 +1124,7 @@ static int ufs_qcom_setup_clocks(struct ufs_hba *hba, bool on,
 				 enum ufs_notify_change_status status)
 {
 	struct ufs_qcom_host *host = ufshcd_get_variant(hba);
-	struct phy *phy = host->generic_phy;
+	struct phy *phy;
 	int err;

 	/*
@@ -1135,6 +1135,8 @@ static int ufs_qcom_setup_clocks(struct ufs_hba *hba, bool on,
 	if (!host)
 		return 0;

+	phy = host->generic_phy;
+
 	switch (status) {
 	case PRE_CHANGE:
 		if (on) {
--
2.48.1

Re: [PATCH V3] scsi: ufs: qcom : Fix NULL pointer dereference in ufs_qcom_setup_clocks

[Martin K. Petersen]

Nitin,

> Fix a NULL pointer dereference in ufs_qcom_setup_clocks due to an
> uninitialized 'host' variable. The variable 'phy' is now assigned
> after confirming 'host' is not NULL.

Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

This will have to go through the phy tree since that's where the rest of
these changes went.

-- 
Martin K. Petersen

Re: [PATCH V3] scsi: ufs: qcom : Fix NULL pointer dereference in ufs_qcom_setup_clocks

[Nitin Rawat]

On 6/25/2025 6:58 AM, Martin K. Petersen wrote:
> 
> Nitin,
> 
>> Fix a NULL pointer dereference in ufs_qcom_setup_clocks due to an
>> uninitialized 'host' variable. The variable 'phy' is now assigned
>> after confirming 'host' is not NULL.
> 
> Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
> 
> This will have to go through the phy tree since that's where the rest of
> these changes went.

Sure Martin. Thanks.

Hi Vinod,
Please could you merge this change through the phy tree.

Regards,
Nitin
> 

Re: [PATCH V3] scsi: ufs: qcom : Fix NULL pointer dereference in ufs_qcom_setup_clocks

[Vinod Koul]

On Mon, 23 Jun 2025 19:18:09 +0530, Nitin Rawat wrote:
> Fix a NULL pointer dereference in ufs_qcom_setup_clocks due to an
> uninitialized 'host' variable. The variable 'phy' is now assigned
> after confirming 'host' is not NULL.
> 
> Call Stack:
> 
> Unable to handle kernel NULL pointer dereference at
> virtual address 0000000000000000
> 
> [...]

Applied, thanks!

[1/1] scsi: ufs: qcom : Fix NULL pointer dereference in ufs_qcom_setup_clocks
      commit: 720fa0cb59e411eca6b274f78073b6d2fe68eb45

Best regards,
-- 
~Vinod