korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 12:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

ARM: SoC fixes for 6.7, part 3

Browse Source 
These are two correctness fixes for handing DT input in the Allwinner
 (sunxi) SMP startup code.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmWYEHsACgkQYKtH/8kJ
 UicbzhAAjO5EfKY506Uj6h/JrNc3Te70qpRCCayq9w7oO4oWABEDbQNWRaw2pWDY
 /HCreQN1369adEnEKk03RLgL62HlbDfLdy5i69hQNy6itvHg8Id/3xX5NKfsu5yz
 gsqc4hBtOw31D+TsS0LI/q2k9lW5Ob1F7/iObxXBQUaQoHEe+SYnAPPJbP388Ro5
 Ae/5Y9fKvVHZ14EmzdU5vha8qyY2I3CFpWegf3ca99yE0S46kSlXwOblNJ/600Lr
 mrrcq90/qAuOAfYsU8U1KwkLpHFPgFe9l2v/xxqYxytNufeW5lvU083Fx+NZcybt
 KJrENFPm6Jsnn8pIbWKX80CViP3I/3qad4wL4kFIRE0c7eCNcz+uxH87zFo32vCh
 h5ajTCL7q++v3hLk/t2jIq5UdXLJy/eqv3kMJ5rjuWJszFzcOaAvqvn7GEKJoQ/3
 B6KWafapYfv3WRoxA9f9OQ+yhIR8ALr3T9omrVoMfX+Yo+Eobev2LgKIP3MSxVjo
 3u3FssdfqpSVCmytwVkCc46kcPKYKTr/K9vhY6DcFJkypIdMylNrZ7aTfFkN4kBC
 tA9Cg1pCrnWyQKSzXSo1NE5z8qSGO+eNzLaMrnyuvKeRuXMrQPOxGz20R/pDYyVS
 C780YbdaI3buMtpFYliX4+dYxTfL/TmkAKTBG7UtzpybtS+baO4=
 =//KH
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-01-05 09:39:24 -08:00
commit 6d0dc8559c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-sunxi/mc_smp.c
View File

@ -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;