openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/32s: Fix is_module_segment() when MODULES_VADDR is defined 

When MODULES_VADDR is defined, is_module_segment() shall check the
address against it instead of checking agains VMALLOC_START.

Fixes: 6ca055322d ("powerpc/32s: Use dedicated segment for modules with STRICT_KERNEL_RWX")
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/07884ed033c31e074747b7eb8eaa329d15db07ec.1596641219.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2020-08-05 15:27:28 +00:00 committed by Michael Ellerman
parent 48d2f0407b
commit 7bee31ad8e
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/powerpc/mm/book3s32/mmu.c
View File

@ -191,10 +191,17 @@ static bool is_module_segment(unsigned long addr)
{ {
if (!IS_ENABLED(CONFIG_MODULES)) if (!IS_ENABLED(CONFIG_MODULES))
return false; return false;
#ifdef MODULES_VADDR
if (addr < ALIGN_DOWN(MODULES_VADDR, SZ_256M))
return false;
if (addr >= ALIGN(MODULES_END, SZ_256M))
return false;
#else
if (addr < ALIGN_DOWN(VMALLOC_START, SZ_256M)) if (addr < ALIGN_DOWN(VMALLOC_START, SZ_256M))
return false; return false;
if (addr >= ALIGN(VMALLOC_END, SZ_256M)) if (addr >= ALIGN(VMALLOC_END, SZ_256M))
return false; return false;
#endif
return true; return true;
} }