samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phy: qcom-qmp-usb: Fix an NULL vs IS_ERR() bug

Browse Source 
[ Upstream commit d14402a38c2d868cacb1facaf9be908ca6558e59 ]

The qmp_usb_iomap() helper function currently returns the raw result of
devm_ioremap() for non-exclusive mappings. Since devm_ioremap() may return
a NULL pointer and the caller only checks error pointers with IS_ERR(),
NULL could bypass the check and lead to an invalid dereference.

Fix the issue by checking if devm_ioremap() returns NULL. When it does,
qmp_usb_iomap() now returns an error pointer via IOMEM_ERR_PTR(-ENOMEM),
ensuring safe and consistent error handling.

Signed-off-by: Chenyuan Yang <chenyuan0y@gmail.com>
Fixes: a5d6b1ac56 ("phy: qcom-qmp-usb: fix memleak on probe deferral")
CC: Johan Hovold <johan@kernel.org>
CC: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20250414125050.2118619-1-chenyuan0y@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Chenyuan Yang
2025-04-14 07:50:50 -05:00
committed by Greg Kroah-Hartman
parent 248f52ad6e
commit 127dfb4f1c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/phy/qualcomm/phy-qcom-qmp-usb.c
View File

@@ -2044,12 +2044,16 @@ static void __iomem *qmp_usb_iomap(struct device *dev, struct device_node *np,
int index, bool exclusive) int index, bool exclusive)
{ {
struct resource res; struct resource res;
void __iomem *mem;
if (!exclusive) { if (!exclusive) {
if (of_address_to_resource(np, index, &res)) if (of_address_to_resource(np, index, &res))
return IOMEM_ERR_PTR(-EINVAL); return IOMEM_ERR_PTR(-EINVAL);
return devm_ioremap(dev, res.start, resource_size(&res)); mem = devm_ioremap(dev, res.start, resource_size(&res));
if (!mem)
return IOMEM_ERR_PTR(-ENOMEM);
return mem;
} }
return devm_of_iomap(dev, np, index, NULL); return devm_of_iomap(dev, np, index, NULL);