* [PATCH] soc: bcm: brcmstb: biuctrl: fix of_iomap leak
@ 2023-03-27 11:54 ` Zhaoyang Li
0 siblings, 0 replies; 4+ messages in thread
From: Zhaoyang Li @ 2023-03-27 11:54 UTC (permalink / raw)
To: Florian Fainelli, Broadcom internal kernel review list
Cc: hust-os-kernel-patches, Zhaoyang Li, Dan Carpenter, Dongliang Mu,
linux-arm-kernel, linux-kernel
Smatch reports:
drivers/soc/bcm/brcmstb/biuctrl.c:291 setup_hifcpubiuctrl_regs() warn:
'cpubiuctrl_base' from of_iomap() not released on lines: 291.
This is because in setup_hifcpubiuctrl_regs(),
cpubiuctrl_base is not released when handle error, which may cause a leak.
To fix this, iounmap is added when handle error.
Fixes: 22f7a9116eba ("soc: brcmstb: Correct CPU_CREDIT_REG offset for Brahma-B53 CPUs")
Signed-off-by: Zhaoyang Li <lizhaoyang04@hust.edu.cn>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
---
From static analysis. Untested
---
drivers/soc/bcm/brcmstb/biuctrl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c
index e1d7b4543248..c92693fad1d2 100644
--- a/drivers/soc/bcm/brcmstb/biuctrl.c
+++ b/drivers/soc/bcm/brcmstb/biuctrl.c
@@ -288,6 +288,10 @@ static int __init setup_hifcpubiuctrl_regs(struct device_node *np)
if (BRCM_ID(family_id) == 0x7260 && BRCM_REV(family_id) == 0)
cpubiuctrl_regs = b53_cpubiuctrl_no_wb_regs;
out:
+ if (ret && cpubiuctrl_base) {
+ iounmap(cpubiuctrl_base);
+ cpubiuctrl_base = NULL;
+ }
return ret;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] soc: bcm: brcmstb: biuctrl: fix of_iomap leak
@ 2023-03-27 11:54 ` Zhaoyang Li
0 siblings, 0 replies; 4+ messages in thread
From: Zhaoyang Li @ 2023-03-27 11:54 UTC (permalink / raw)
To: Florian Fainelli, Broadcom internal kernel review list
Cc: hust-os-kernel-patches, Zhaoyang Li, Dan Carpenter, Dongliang Mu,
linux-arm-kernel, linux-kernel
Smatch reports:
drivers/soc/bcm/brcmstb/biuctrl.c:291 setup_hifcpubiuctrl_regs() warn:
'cpubiuctrl_base' from of_iomap() not released on lines: 291.
This is because in setup_hifcpubiuctrl_regs(),
cpubiuctrl_base is not released when handle error, which may cause a leak.
To fix this, iounmap is added when handle error.
Fixes: 22f7a9116eba ("soc: brcmstb: Correct CPU_CREDIT_REG offset for Brahma-B53 CPUs")
Signed-off-by: Zhaoyang Li <lizhaoyang04@hust.edu.cn>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
---
From static analysis. Untested
---
drivers/soc/bcm/brcmstb/biuctrl.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/soc/bcm/brcmstb/biuctrl.c b/drivers/soc/bcm/brcmstb/biuctrl.c
index e1d7b4543248..c92693fad1d2 100644
--- a/drivers/soc/bcm/brcmstb/biuctrl.c
+++ b/drivers/soc/bcm/brcmstb/biuctrl.c
@@ -288,6 +288,10 @@ static int __init setup_hifcpubiuctrl_regs(struct device_node *np)
if (BRCM_ID(family_id) == 0x7260 && BRCM_REV(family_id) == 0)
cpubiuctrl_regs = b53_cpubiuctrl_no_wb_regs;
out:
+ if (ret && cpubiuctrl_base) {
+ iounmap(cpubiuctrl_base);
+ cpubiuctrl_base = NULL;
+ }
return ret;
}
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] soc: bcm: brcmstb: biuctrl: fix of_iomap leak
2023-03-27 11:54 ` Zhaoyang Li
@ 2023-04-03 20:37 ` Florian Fainelli
-1 siblings, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2023-04-03 20:37 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Zhaoyang Li
Cc: hust-os-kernel-patches, Dan Carpenter, Dongliang Mu,
linux-arm-kernel, linux-kernel
On Mon, 27 Mar 2023 19:54:22 +0800, Zhaoyang Li <lizhaoyang04@hust.edu.cn> wrote:
> Smatch reports:
>
> drivers/soc/bcm/brcmstb/biuctrl.c:291 setup_hifcpubiuctrl_regs() warn:
> 'cpubiuctrl_base' from of_iomap() not released on lines: 291.
>
> This is because in setup_hifcpubiuctrl_regs(),
> cpubiuctrl_base is not released when handle error, which may cause a leak.
> To fix this, iounmap is added when handle error.
>
> Fixes: 22f7a9116eba ("soc: brcmstb: Correct CPU_CREDIT_REG offset for Brahma-B53 CPUs")
> Signed-off-by: Zhaoyang Li <lizhaoyang04@hust.edu.cn>
> Reviewed-by: Dan Carpenter <error27@gmail.com>
> Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/drivers/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] soc: bcm: brcmstb: biuctrl: fix of_iomap leak
@ 2023-04-03 20:37 ` Florian Fainelli
0 siblings, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2023-04-03 20:37 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Zhaoyang Li
Cc: hust-os-kernel-patches, Dan Carpenter, Dongliang Mu,
linux-arm-kernel, linux-kernel
On Mon, 27 Mar 2023 19:54:22 +0800, Zhaoyang Li <lizhaoyang04@hust.edu.cn> wrote:
> Smatch reports:
>
> drivers/soc/bcm/brcmstb/biuctrl.c:291 setup_hifcpubiuctrl_regs() warn:
> 'cpubiuctrl_base' from of_iomap() not released on lines: 291.
>
> This is because in setup_hifcpubiuctrl_regs(),
> cpubiuctrl_base is not released when handle error, which may cause a leak.
> To fix this, iounmap is added when handle error.
>
> Fixes: 22f7a9116eba ("soc: brcmstb: Correct CPU_CREDIT_REG offset for Brahma-B53 CPUs")
> Signed-off-by: Zhaoyang Li <lizhaoyang04@hust.edu.cn>
> Reviewed-by: Dan Carpenter <error27@gmail.com>
> Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/drivers/next, thanks!
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-03 20:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-27 11:54 [PATCH] soc: bcm: brcmstb: biuctrl: fix of_iomap leak Zhaoyang Li
2023-03-27 11:54 ` Zhaoyang Li
2023-04-03 20:37 ` Florian Fainelli
2023-04-03 20:37 ` Florian Fainelli
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.