diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-05 09:39:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-05 09:39:24 -0800 |
| commit | 6d0dc8559c847e2dcd66c5dd93dbab3d3d887ff5 (patch) | |
| tree | 124ee951e5bb47f76d9aa3e5647b62579c229b7c | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| parent | ARM: sun9i: smp: fix return code check of of_property_match_string (diff) | |
| download | wireguard-linux-6d0dc8559c847e2dcd66c5dd93dbab3d3d887ff5.tar.xz wireguard-linux-6d0dc8559c847e2dcd66c5dd93dbab3d3d887ff5.zip | |
Merge tag 'soc-fixes-6.7-3a' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann:
"These are two correctness fixes for handing DT input in the
Allwinner (sunxi) SMP startup code"
* tag 'soc-fixes-6.7-3a' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
ARM: sun9i: smp: fix return code check of of_property_match_string
ARM: sun9i: smp: Fix array-index-out-of-bounds read in sunxi_mc_smp_init
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/mach-sunxi/mc_smp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-sunxi/mc_smp.c b/arch/arm/mach-sunxi/mc_smp.c index cb63921232a6..277f6aa8e6c2 100644 --- a/arch/arm/mach-sunxi/mc_smp.c +++ b/arch/arm/mach-sunxi/mc_smp.c @@ -803,16 +803,16 @@ static int __init sunxi_mc_smp_init(void) for (i = 0; i < ARRAY_SIZE(sunxi_mc_smp_data); i++) { ret = of_property_match_string(node, "enable-method", sunxi_mc_smp_data[i].enable_method); - if (!ret) + if (ret >= 0) break; } - is_a83t = sunxi_mc_smp_data[i].is_a83t; - of_node_put(node); - if (ret) + if (ret < 0) return -ENODEV; + is_a83t = sunxi_mc_smp_data[i].is_a83t; + if (!sunxi_mc_smp_cpu_table_init()) return -EINVAL; |