Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5abd2626 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

sh: machvec: Use char[] for section boundaries 



[ Upstream commit c5783af354688b24abd359f7086c282ec74de993 ]

As done for other sections, define the extern as a character array,
which relaxes many of the compiler-time object size checks, which would
otherwise assume it's a single long. Solves the following build error:

arch/sh/kernel/machvec.c: error: array subscript 'struct sh_machine_vector[0]' is partly outside array bounds of 'long int[1]' [-Werror=array-bounds]:  => 105:33

Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: linux-sh@vger.kernel.org
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/lkml/alpine.DEB.2.22.394.2209050944290.964530@ramsan.of.borg/


Fixes: 9655ad03 ("sh: Fixup machvec support.")
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Acked-by: default avatarRich Felker <dalias@libc.org>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c0f4be83

arch/sh/include/asm/sections.h

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


#include <asm-generic/sections.h>



extern long __machvec_start, __machvec_end;

extern char __machvec_start[], __machvec_end[];

extern char __uncached_start, __uncached_end;

extern char __start_eh_frame[], __stop_eh_frame[];

arch/sh/kernel/machvec.c

+5 −5
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#define MV_NAME_SIZE 32



#define for_each_mv(mv) \

	for ((mv) = (struct sh_machine_vector *)&__machvec_start; \

	     (mv) && (unsigned long)(mv) < (unsigned long)&__machvec_end; \

	for ((mv) = (struct sh_machine_vector *)__machvec_start; \

	     (mv) && (unsigned long)(mv) < (unsigned long)__machvec_end; \

	     (mv)++)



static struct sh_machine_vector * __init get_mv_byname(const char *name)
@@ -86,8 +86,8 @@ void __init sh_mv_setup(void) 
	if (!machvec_selected) {

		unsigned long machvec_size;



		machvec_size = ((unsigned long)&__machvec_end -

				(unsigned long)&__machvec_start);

		machvec_size = ((unsigned long)__machvec_end -

				(unsigned long)__machvec_start);



		/*

		 * Sanity check for machvec section alignment. Ensure
@@ -101,7 +101,7 @@ void __init sh_mv_setup(void) 
		 * vector (usually the only one) from .machvec.init.

		 */

		if (machvec_size >= sizeof(struct sh_machine_vector))

			sh_mv = *(struct sh_machine_vector *)&__machvec_start;

			sh_mv = *(struct sh_machine_vector *)__machvec_start;

	}



	printk(KERN_NOTICE "Booting machvec: %s\n", get_system_type());