[PATCH] of: cpu: add check in __of_find_n_match_cpu_property()

[PATCH] of: cpu: add check in __of_find_n_match_cpu_property()

[Sergey Shtylyov]

In __of_find_n_match_cpu_property(), checking the variable ac for 0 won't
prevent a possible overflow when multiplying it by sizeof(*cell). Besides,
of_read_number() (called in the *for* loop) can't return correct result if
that variable (which equals the #address-cells prop's value) exceeds 2, so
additionally checking for that seems logical...

Found by Linux Verification Center (linuxtesting.org) with the Svace static
analysis tool.

Fixes: f3cea45a77c8 ("of: Fix iteration bug over CPU reg properties")
Signed-off-by: Sergey Shtylyov <s.shtylyov@auroraos.dev>

---
The patch is against the dt/linus branch of Rob Herring's linux.git repo...

 drivers/of/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/of/cpu.c b/drivers/of/cpu.c
index 5214dc3d05ae..bd0e918d6f29 100644
--- a/drivers/of/cpu.c
+++ b/drivers/of/cpu.c
@@ -60,7 +60,7 @@ static bool __of_find_n_match_cpu_property(struct device_node *cpun,
 	cell = of_get_property(cpun, prop_name, &prop_len);
 	if (!cell && !ac && arch_match_cpu_phys_id(cpu, 0))
 		return true;
-	if (!cell || !ac)
+	if (!cell || !ac || ac > 2)
 		return false;
 	prop_len /= sizeof(*cell) * ac;
 	for (tid = 0; tid < prop_len; tid++) {
-- 
2.53.0

Re: [PATCH] of: cpu: add check in __of_find_n_match_cpu_property()

[Rob Herring (Arm)]

On Wed, 29 Apr 2026 23:14:39 +0300, Sergey Shtylyov wrote:
> In __of_find_n_match_cpu_property(), checking the variable ac for 0 won't
> prevent a possible overflow when multiplying it by sizeof(*cell). Besides,
> of_read_number() (called in the *for* loop) can't return correct result if
> that variable (which equals the #address-cells prop's value) exceeds 2, so
> additionally checking for that seems logical...
> 
> Found by Linux Verification Center (linuxtesting.org) with the Svace static
> analysis tool.
> 
> Fixes: f3cea45a77c8 ("of: Fix iteration bug over CPU reg properties")
> Signed-off-by: Sergey Shtylyov <s.shtylyov@auroraos.dev>
> 
> ---
> The patch is against the dt/linus branch of Rob Herring's linux.git repo...
> 
>  drivers/of/cpu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Applied, thanks!