[PATCH v2] soc: bcm: brcmstb: biuctrl: fix of_iomap leak

[Zhaoyang Li]

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 <lizhao...@hust.edu.cn>
Reviewed-by: Dan Carpenter <err...@gmail.com>
Reviewed-by: Dongliang Mu <dz...@hust.edu.cn>
---
v1->v2: Correct the patch and remove the line number in commit message.
---
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

[Dan Carpenter]

On Mon, Mar 27, 2023 at 06:54:19PM +0800, Zhaoyang Li 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 <lizhao...@hust.edu.cn>
> Reviewed-by: Dan Carpenter <err...@gmail.com>

Don't add Reviewed-by tags unless someone tells you explicitly to add
them. That said, it's fine:

Reviewed-by: Dan Carpenter <err...@gmail.com>

regards,
dan carpenter

> Reviewed-by: Dongliang Mu <dz...@hust.edu.cn>
> ---
> v1->v2: Correct the patch and remove the line number in commit message.

Make sure you put "From static analysis. Untested" here.

regards,
dan carpenter

[Zhaoyang Li]

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 <lizhao...@hust.edu.cn>
Reviewed-by: Dan Carpenter <err...@gmail.com>

Reviewed-by: Dongliang Mu <dz...@hust.edu.cn>
---

From static analysis. Untested

[Florian Fainelli]

On Mon, 27 Mar 2023 19:54:22 +0800, Zhaoyang Li <lizhao...@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 <lizhao...@hust.edu.cn>
> Reviewed-by: Dan Carpenter <err...@gmail.com>
> Reviewed-by: Dongliang Mu <dz...@hust.edu.cn>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/drivers/next, thanks!
--
Florian