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

Commit adcf5918 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: don't use direct assignation during early boot. 



In kernel/cputable.c, explicitly use memcpy() instead of *y = *x;
This will allow GCC to replace it with __memcpy() when KASAN is
selected.

Acked-by: default avatarDmitry Vyukov <dvyukov@google.com>
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 450e7dd4

arch/powerpc/kernel/cputable.c

+10 −3
Original line number Diff line number Diff line
@@ -2147,7 +2147,11 @@ void __init set_cur_cpu_spec(struct cpu_spec *s) 
	struct cpu_spec *t = &the_cpu_spec;



	t = PTRRELOC(t);

	*t = *s;

	/*

	 * use memcpy() instead of *t = *s so that GCC replaces it

	 * by __memcpy() when KASAN is active

	 */

	memcpy(t, s, sizeof(*t));



	*PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;

}
@@ -2161,8 +2165,11 @@ static struct cpu_spec * __init setup_cpu_spec(unsigned long offset, 
	t = PTRRELOC(t);

	old = *t;



	/* Copy everything, then do fixups */

	*t = *s;

	/*

	 * Copy everything, then do fixups. Use memcpy() instead of *t = *s

	 * so that GCC replaces it by __memcpy() when KASAN is active

	 */

	memcpy(t, s, sizeof(*t));



	/*

	 * If we are overriding a previous value derived from the real

arch/powerpc/kernel/prom_init.c

+8 −2
Original line number Diff line number Diff line
@@ -1264,8 +1264,14 @@ static void __init prom_check_platform_support(void) 
	int prop_len = prom_getproplen(prom.chosen,

				       "ibm,arch-vec-5-platform-support");



	/* First copy the architecture vec template */

	ibm_architecture_vec = ibm_architecture_vec_template;

	/*

	 * First copy the architecture vec template

	 *

	 * use memcpy() instead of *vec = *vec_template so that GCC replaces it

	 * by __memcpy() when KASAN is active

	 */

	memcpy(&ibm_architecture_vec, &ibm_architecture_vec_template,

	       sizeof(ibm_architecture_vec));



	if (prop_len > 1) {

		int i;