| Message ID | 20220331190443.851661-1-keescook@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: vexpress/spc: Avoid negative array index when !SMP | expand |
On Thu, Mar 31, 2022 at 12:04:43PM -0700, Kees Cook wrote: > When building multi_v7_defconfig+CONFIG_SMP=n, -Warray-bounds exposes > a couple negative array index accesses: > > arch/arm/mach-vexpress/spc.c: In function 've_spc_clk_init': > arch/arm/mach-vexpress/spc.c:583:21: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] > 583 | if (init_opp_table[cluster]) > | ~~~~~~~~~~~~~~^~~~~~~~~ > arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' > 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; > | ^~~~~~~~~~~~~~ > arch/arm/mach-vexpress/spc.c:592:18: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] > 592 | init_opp_table[cluster] = true; > | ~~~~~~~~~~~~~~^~~~~~~~~ > arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' > 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; > | ^~~~~~~~~~~~~~ > > Skip this logic when built !SMP. > > Cc: Liviu Dudau <liviu.dudau@arm.com> > Cc: Sudeep Holla <sudeep.holla@arm.com> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > Cc: Russell King <linux@armlinux.org.uk> > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: Liviu Dudau <liviu.dudau@arm.com> Sudeep, can you please take this through your tree for sending it to arm-soc? Best regards, Liviu > --- > arch/arm/mach-vexpress/spc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c > index 1da11bdb1dfb..1c6500c4e6a1 100644 > --- a/arch/arm/mach-vexpress/spc.c > +++ b/arch/arm/mach-vexpress/spc.c > @@ -580,7 +580,7 @@ static int __init ve_spc_clk_init(void) > } > > cluster = topology_physical_package_id(cpu_dev->id); > - if (init_opp_table[cluster]) > + if (cluster < 0 || init_opp_table[cluster]) > continue; > > if (ve_init_opp_table(cpu_dev)) > -- > 2.32.0 >
On Fri, Apr 01, 2022 at 10:28:29AM +0100, Liviu Dudau wrote: > On Thu, Mar 31, 2022 at 12:04:43PM -0700, Kees Cook wrote: > > When building multi_v7_defconfig+CONFIG_SMP=n, -Warray-bounds exposes > > a couple negative array index accesses: > > > > arch/arm/mach-vexpress/spc.c: In function 've_spc_clk_init': > > arch/arm/mach-vexpress/spc.c:583:21: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] > > 583 | if (init_opp_table[cluster]) > > | ~~~~~~~~~~~~~~^~~~~~~~~ > > arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' > > 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; > > | ^~~~~~~~~~~~~~ > > arch/arm/mach-vexpress/spc.c:592:18: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] > > 592 | init_opp_table[cluster] = true; > > | ~~~~~~~~~~~~~~^~~~~~~~~ > > arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' > > 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; > > | ^~~~~~~~~~~~~~ > > > > Skip this logic when built !SMP. > > > > Cc: Liviu Dudau <liviu.dudau@arm.com> > > Cc: Sudeep Holla <sudeep.holla@arm.com> > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > > Cc: Russell King <linux@armlinux.org.uk> > > Cc: linux-arm-kernel@lists.infradead.org > > Signed-off-by: Kees Cook <keescook@chromium.org> > > Acked-by: Liviu Dudau <liviu.dudau@arm.com> > > Sudeep, can you please take this through your tree for sending it to arm-soc? > Sure, I will do that as soon as -rc1 is out.
On Fri, Apr 01, 2022 at 11:11:47AM +0100, Sudeep Holla wrote: > On Fri, Apr 01, 2022 at 10:28:29AM +0100, Liviu Dudau wrote: > > On Thu, Mar 31, 2022 at 12:04:43PM -0700, Kees Cook wrote: > > > When building multi_v7_defconfig+CONFIG_SMP=n, -Warray-bounds exposes > > > a couple negative array index accesses: > > > > > > arch/arm/mach-vexpress/spc.c: In function 've_spc_clk_init': > > > arch/arm/mach-vexpress/spc.c:583:21: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] > > > 583 | if (init_opp_table[cluster]) > > > | ~~~~~~~~~~~~~~^~~~~~~~~ > > > arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' > > > 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; > > > | ^~~~~~~~~~~~~~ > > > arch/arm/mach-vexpress/spc.c:592:18: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] > > > 592 | init_opp_table[cluster] = true; > > > | ~~~~~~~~~~~~~~^~~~~~~~~ > > > arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' > > > 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; > > > | ^~~~~~~~~~~~~~ > > > > > > Skip this logic when built !SMP. > > > > > > Cc: Liviu Dudau <liviu.dudau@arm.com> > > > Cc: Sudeep Holla <sudeep.holla@arm.com> > > > Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> > > > Cc: Russell King <linux@armlinux.org.uk> > > > Cc: linux-arm-kernel@lists.infradead.org > > > Signed-off-by: Kees Cook <keescook@chromium.org> > > > > Acked-by: Liviu Dudau <liviu.dudau@arm.com> > > > > Sudeep, can you please take this through your tree for sending it to arm-soc? > > > > Sure, I will do that as soon as -rc1 is out. Cheers, much appreciated! Best regards, Liviu > > -- > Regards, > Sudeep
On Thu, 31 Mar 2022 12:04:43 -0700, Kees Cook wrote: > When building multi_v7_defconfig+CONFIG_SMP=n, -Warray-bounds exposes > a couple negative array index accesses: > > arch/arm/mach-vexpress/spc.c: In function 've_spc_clk_init': > arch/arm/mach-vexpress/spc.c:583:21: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] > 583 | if (init_opp_table[cluster]) > | ~~~~~~~~~~~~~~^~~~~~~~~ > arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' > 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; > | ^~~~~~~~~~~~~~ > arch/arm/mach-vexpress/spc.c:592:18: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] > 592 | init_opp_table[cluster] = true; > | ~~~~~~~~~~~~~~^~~~~~~~~ > arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' > 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; > | ^~~~~~~~~~~~~~ > > [...] Applied to sudeep.holla/linux (fixes/vexpress), thanks! [1/1] ARM: vexpress/spc: Avoid negative array index when !SMP https://git.kernel.org/sudeep.holla/c/b3f1dd52c9 -- Regards, Sudeep
diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c index 1da11bdb1dfb..1c6500c4e6a1 100644 --- a/arch/arm/mach-vexpress/spc.c +++ b/arch/arm/mach-vexpress/spc.c @@ -580,7 +580,7 @@ static int __init ve_spc_clk_init(void) } cluster = topology_physical_package_id(cpu_dev->id); - if (init_opp_table[cluster]) + if (cluster < 0 || init_opp_table[cluster]) continue; if (ve_init_opp_table(cpu_dev))
When building multi_v7_defconfig+CONFIG_SMP=n, -Warray-bounds exposes a couple negative array index accesses: arch/arm/mach-vexpress/spc.c: In function 've_spc_clk_init': arch/arm/mach-vexpress/spc.c:583:21: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] 583 | if (init_opp_table[cluster]) | ~~~~~~~~~~~~~~^~~~~~~~~ arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; | ^~~~~~~~~~~~~~ arch/arm/mach-vexpress/spc.c:592:18: warning: array subscript -1 is below array bounds of 'bool[2]' {aka '_Bool[2]'} [-Warray-bounds] 592 | init_opp_table[cluster] = true; | ~~~~~~~~~~~~~~^~~~~~~~~ arch/arm/mach-vexpress/spc.c:556:7: note: while referencing 'init_opp_table' 556 | bool init_opp_table[MAX_CLUSTERS] = { false }; | ^~~~~~~~~~~~~~ Skip this logic when built !SMP. Cc: Liviu Dudau <liviu.dudau@arm.com> Cc: Sudeep Holla <sudeep.holla@arm.com> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Russell King <linux@armlinux.org.uk> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Kees Cook <keescook@chromium.org> --- arch/arm/mach-vexpress/spc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.32.0