Commit 08c8e685 authored by Heiko Carstens's avatar Heiko Carstens Committed by Vasily Gorbik
Browse files

s390: add ARCH_HAS_DEBUG_WX support 



Checks the whole kernel address space for W+X mappings. Note that
currently the first lowcore page unfortunately has to be mapped
W+X. Therefore this not reported as an insecure mapping.

For the very same reason the wording is also different to other
architectures if the test passes:

On s390 it is "no unexpected W+X pages found" instead of
"no W+X pages found".

Tested-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 6bf9a639

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ config S390 
	def_bool y

	select ARCH_BINFMT_ELF_STATE

	select ARCH_HAS_DEBUG_VM_PGTABLE

	select ARCH_HAS_DEBUG_WX

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

arch/s390/configs/debug_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -774,6 +774,7 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_PAGEALLOC=y

CONFIG_PAGE_OWNER=y

CONFIG_DEBUG_RODATA_TEST=y

CONFIG_DEBUG_WX=y

CONFIG_PTDUMP_DEBUGFS=y

CONFIG_DEBUG_OBJECTS=y

CONFIG_DEBUG_OBJECTS_SELFTEST=y

arch/s390/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -758,6 +758,7 @@ CONFIG_GDB_SCRIPTS=y 
CONFIG_FRAME_WARN=1024

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_WX=y

CONFIG_PTDUMP_DEBUGFS=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_PANIC_ON_OOPS=y

arch/s390/include/asm/ptdump.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef _ASM_S390_PTDUMP_H

#define _ASM_S390_PTDUMP_H



void ptdump_check_wx(void);



static inline void debug_checkwx(void)

{

	if (IS_ENABLED(CONFIG_DEBUG_WX))

		ptdump_check_wx();

}



#endif /* _ASM_S390_PTDUMP_H */

arch/s390/mm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ obj-y += page-states.o pageattr.o pgtable.o pgalloc.o 


obj-$(CONFIG_CMM)		+= cmm.o

obj-$(CONFIG_HUGETLB_PAGE)	+= hugetlbpage.o

obj-$(CONFIG_PTDUMP_DEBUGFS)	+= dump_pagetables.o

obj-$(CONFIG_PTDUMP_CORE)	+= dump_pagetables.o

obj-$(CONFIG_PGSTE)		+= gmap.o



KASAN_SANITIZE_kasan_init.o	:= n

CRA Git | Maintained and supported by SUSTech CRA and CCSE