2022-06-28 13:59:25

by Yang Yingliang

[permalink] [raw]
Subject: [PATCH -next 2/2] soc: fsl: guts: check return value after calling of_iomap() in fsl_guts_get_soc_uid()

of_iomap() may return NULL, so we need check the return value.

Fixes: 786dde1e59d7 ("soc: fsl: guts: add serial_number support")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Yang Yingliang <[email protected]>
---
drivers/soc/fsl/guts.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c
index 8038c599ad83..6bf3e6a980ff 100644
--- a/drivers/soc/fsl/guts.c
+++ b/drivers/soc/fsl/guts.c
@@ -126,6 +126,10 @@ static u64 fsl_guts_get_soc_uid(const char *compat, unsigned int offset)
return 0;

sfp_base = of_iomap(np, 0);
+ if (!sfp_base) {
+ of_node_put(np);
+ return 0;
+ }

uid = ioread32(sfp_base + offset);
uid <<= 32;
--
2.25.1


2022-06-28 14:32:12

by Michael Walle

[permalink] [raw]
Subject: Re: [PATCH -next 2/2] soc: fsl: guts: check return value after calling of_iomap() in fsl_guts_get_soc_uid()

Am 2022-06-28 16:02, schrieb Yang Yingliang:
> of_iomap() may return NULL, so we need check the return value.
>
> Fixes: 786dde1e59d7 ("soc: fsl: guts: add serial_number support")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Yang Yingliang <[email protected]>

Reviewed-by: Michael Walle <[email protected]>