2021-04-09 04:46:59

by Yang Yingliang

[permalink] [raw]

Subject: [PATCH -next] soc/tegra: fuse: add missing iounmap() on error in tegra_init_fuse()

---

Add the missing iounmap() before return from tegra_init_fuse()
in the error handling case.

Fixes: 9f94fadd75d3 ("soc/tegra: fuse: Register cell lookups for compatibility")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Yang Yingliang <[email protected]>
---
drivers/soc/tegra/fuse/fuse-tegra.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
index 94b60a692b51..bc8d70e6a676 100644
--- a/drivers/soc/tegra/fuse/fuse-tegra.c
+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
@@ -489,8 +489,10 @@ static int __init tegra_init_fuse(void)
size_t size = sizeof(*fuse->lookups) * fuse->soc->num_lookups;

fuse->lookups = kmemdup(fuse->soc->lookups, size, GFP_KERNEL);
- if (!fuse->lookups)
+ if (!fuse->lookups) {
+ iounmap(fuse->base);
return -ENOMEM;
+ }

nvmem_add_cell_lookups(fuse->lookups, fuse->soc->num_lookups);
}
--
2.25.1

2021-04-09 11:33:59

by Thierry Reding

[permalink] [raw]

Subject: Re: [PATCH -next] soc/tegra: fuse: add missing iounmap() on error in tegra_init_fuse()

---

On Fri, Apr 09, 2021 at 12:49:03PM +0800, Yang Yingliang wrote:
> Add the missing iounmap() before return from tegra_init_fuse()
> in the error handling case.
>
> Fixes: 9f94fadd75d3 ("soc/tegra: fuse: Register cell lookups for compatibility")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Yang Yingliang <[email protected]>
> ---
> drivers/soc/tegra/fuse/fuse-tegra.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
> index 94b60a692b51..bc8d70e6a676 100644
> --- a/drivers/soc/tegra/fuse/fuse-tegra.c
> +++ b/drivers/soc/tegra/fuse/fuse-tegra.c
> @@ -489,8 +489,10 @@ static int __init tegra_init_fuse(void)
> size_t size = sizeof(*fuse->lookups) * fuse->soc->num_lookups;
>
> fuse->lookups = kmemdup(fuse->soc->lookups, size, GFP_KERNEL);
> - if (!fuse->lookups)
> + if (!fuse->lookups) {
> + iounmap(fuse->base);
> return -ENOMEM;
> + }
>
> nvmem_add_cell_lookups(fuse->lookups, fuse->soc->num_lookups);
> }

I don't think that's a good idea. Given that this is an early_initcall,
the failure doesn't actually prevent the driver from loading. There are
other functions that rely on fuse->base staying around to access some of
the registers in that I/O memory region.

I suppose we could remove the -ENOMEM return there and instead just skip
registering the nvmem cell lookups, perhaps that would make this less
confusing.

Thierry

---

Attachments:

(No filename) (1.49 kB)
signature.asc (849.00 B)
Download all attachments