From: ChiYuan Huang <cy_huang@richtek.com> mainline inclusion from mainline-v6.2-rc1 commit 0debed5b117d11e33cba52870c4dcb64f5911891 category: bugfix bugzilla: https://atomgit.com/src-openeuler/kernel/issues/11299 CVE: CVE-2022-50616 Reference: https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commi... -------------------------------- From Marek's log, the previous change modify the parent of rdev. https://lore.kernel.org/all/58b92e75-f373-dae7-7031-8abd465bb874@samsung.com... In 'regulator_resolve_supply', it uses the parent DT node of rdev as the DT-lookup starting node. But the parent DT node may not exist. This will cause the NULL supply issue. This patch modify the parent of rdev back to the device that provides from 'regulator_config' in 'regulator_register'. Fixes: 8f3cbcd6b440 ("regulator: core: Use different devices for resource allocation and DT lookup") Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: ChiYuan Huang <cy_huang@richtek.com> Link: https://lore.kernel.org/r/1670981831-12583-1-git-send-email-u0084500@gmail.c... Signed-off-by: Mark Brown <broonie@kernel.org> Conflicts: drivers/regulator/core.c [just context conflicts] Signed-off-by: Liu Mingrui <liumingrui@huawei.com> Signed-off-by: Mingrui Liu <liumingrui@huawei.com> --- drivers/regulator/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index a7e71d5a7124..f580e22ca538 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -5407,7 +5407,7 @@ regulator_register(struct device *dev, /* register with sysfs */ rdev->dev.class = ®ulator_class; - rdev->dev.parent = dev; + rdev->dev.parent = config->dev; dev_set_name(&rdev->dev, "regulator.%lu", (unsigned long) atomic_inc_return(®ulator_no)); dev_set_drvdata(&rdev->dev, rdev); -- 2.34.1