xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: renesas: core: Fix possible null-ptr-deref in sh_pfc_map_resources()

Browse Source 
[ Upstream commit 5376e3d904532e657fd7ca1a9b1ff3d351527b90 ]

It will cause null-ptr-deref when using 'res', if platform_get_resource()
returns NULL, so move using 'res' after devm_ioremap_resource() that
will check it to avoid null-ptr-deref.
And use devm_platform_get_and_ioremap_resource() to simplify code.

Fixes: c7977ec4a3 ("pinctrl: sh-pfc: Convert to platform_get_*()")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20220429082637.1308182-1-yangyingliang@huawei.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Yang Yingliang
2022-04-29 16:26:36 +08:00
committed by Greg Kroah-Hartman
parent f7c290eac8
commit f991879762
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/pinctrl/renesas/core.c
View File

@@ -71,12 +71,11 @@ static int sh_pfc_map_resources(struct sh_pfc *pfc,
/* Fill them. */ /* Fill them. */
for (i = 0; i < num_windows; i++) { for (i = 0; i < num_windows; i++) {
res = platform_get_resource(pdev, IORESOURCE_MEM, i); windows->virt = devm_platform_get_and_ioremap_resource(pdev, i, &res);
windows->phys = res->start;
windows->size = resource_size(res);
windows->virt = devm_ioremap_resource(pfc->dev, res);
if (IS_ERR(windows->virt)) if (IS_ERR(windows->virt))
return -ENOMEM; return -ENOMEM;
windows->phys = res->start;
windows->size = resource_size(res);
windows++; windows++;
} }
for (i = 0; i < num_irqs; i++) for (i = 0; i < num_irqs; i++)