[SRU][O][PATCH 14/18] phy: qcom: qmp-usb: fix NULL-deref on runtime suspend

Juerg Haefliger juerg.haefliger at canonical.com
Tue Nov 26 08:50:09 UTC 2024


From: Johan Hovold <johan+linaro at kernel.org>

BugLink: https://bugs.launchpad.net/bugs/2089237

Commit 413db06c05e7 ("phy: qcom-qmp-usb: clean up probe initialisation")
removed most users of the platform device driver data, but mistakenly
also removed the initialisation despite the data still being used in the
runtime PM callbacks.

Restore the driver data initialisation at probe to avoid a NULL-pointer
dereference on runtime suspend.

Apparently no one uses runtime PM, which currently needs to be enabled
manually through sysfs, with this driver.

Fixes: 413db06c05e7 ("phy: qcom-qmp-usb: clean up probe initialisation")
Cc: stable at vger.kernel.org	# 6.2
Signed-off-by: Johan Hovold <johan+linaro at kernel.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov at linaro.org>
Link: https://lore.kernel.org/r/20240911115253.10920-2-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul at kernel.org>
(cherry picked from commit bd9e4d4a3b127686efc60096271b0a44c3100061)
Signed-off-by: Juerg Haefliger <juerg.haefliger at canonical.com>
---
 drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 9b0eb87b1680..f91446d1d2c3 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@ -2179,6 +2179,7 @@ static int qmp_usb_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	qmp->dev = dev;
+	dev_set_drvdata(dev, qmp);
 
 	qmp->cfg = of_device_get_match_data(dev);
 	if (!qmp->cfg)
-- 
2.43.0




More information about the kernel-team mailing list