2021-04-24 10:36:00

by Christophe Leroy

Subject: [PATCH] powerpc/kasan: Fix shadow start address with modules

Modules are now located before kernel, KASAN area has to
be extended accordingly.

Fixes: 80edc68e0479 ("powerpc/32s: Define a MODULE area below kernel text all the time")
Fixes: 9132a2e82adc ("powerpc/8xx: Define a MODULE area below kernel text")
Signed-off-by: Christophe Leroy <[email protected]>
---
arch/powerpc/include/asm/kasan.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h
index 7355ed05e65e..3c478e5ef24c 100644
--- a/arch/powerpc/include/asm/kasan.h
+++ b/arch/powerpc/include/asm/kasan.h
@@ -19,7 +19,7 @@

#define KASAN_SHADOW_SCALE_SHIFT 3

-#if defined(CONFIG_PPC_BOOK3S_32) && defined(CONFIG_MODULES) && defined(CONFIG_STRICT_KERNEL_RWX)
+#ifdef CONFIG_MODULES
#define KASAN_KERN_START ALIGN_DOWN(PAGE_OFFSET - SZ_256M, SZ_256M)
#else
#define KASAN_KERN_START PAGE_OFFSET
--
2.25.0

2021-04-29 14:03:58

by Michael Ellerman

Subject: Re: [PATCH] powerpc/kasan: Fix shadow start address with modules

On Sat, 24 Apr 2021 10:34:43 +0000 (UTC), Christophe Leroy wrote:
> Modules are now located before kernel, KASAN area has to
> be extended accordingly.

Applied to powerpc/next.

[1/1] powerpc/kasan: Fix shadow start address with modules
https://git.kernel.org/powerpc/c/30c400886bad4ac1801516683b71d7714bc2b1b1

cheers