s390/kasan: make shadow memory noexec (d411e3c6) · Commits · 戴 / test

ARCH_HAS_DEBUG_WX feature support brought attention to the fact that currently initial kasan shadow memory mapped without noexec flag. So fix that. Temporary initial identity mapping is still created without noexec, but it is replaced by properly set up paging later. Signed-off-by:

Vasily Gorbik <gor@linux.ibm.com> Signed-off-by:

Heiko Carstens <hca@linux.ibm.com> Signed-off-by:

Vasily Gorbik <gor@linux.ibm.com>

arch/s390/mm/kasan_init.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -99,8 +99,12 @@ static void __init kasan_early_vmemmap_populate(unsigned long address,
		pgt_prot_zero = pgprot_val(PAGE_KERNEL_RO);
		if (!has_nx)
		pgt_prot_zero &= ~_PAGE_NOEXEC;
		pgt_prot = pgprot_val(PAGE_KERNEL_EXEC);
		sgt_prot = pgprot_val(SEGMENT_KERNEL_EXEC);
		pgt_prot = pgprot_val(PAGE_KERNEL);
		sgt_prot = pgprot_val(SEGMENT_KERNEL);
		if (!has_nx \|\| mode == POPULATE_ONE2ONE) {
		pgt_prot &= ~_PAGE_NOEXEC;
		sgt_prot &= ~_SEGMENT_ENTRY_NOEXEC;
		}

		while (address < end) {
		pg_dir = pgd_offset_k(address);

Admin message