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

Commit c420f167 authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Linus Torvalds
Browse files

kasan: enable stack instrumentation 



Stack instrumentation allows to detect out of bounds memory accesses for
variables allocated on stack.  Compiler adds redzones around every
variable on stack and poisons redzones in function's prologue.

Such approach significantly increases stack usage, so all in-kernel stacks
size were doubled.

Signed-off-by: default avatarAndrey Ryabinin <a.ryabinin@samsung.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Konstantin Serebryany <kcc@google.com>
Cc: Dmitry Chernenkov <dmitryc@google.com>
Signed-off-by: default avatarAndrey Konovalov <adech.fo@gmail.com>
Cc: Yuri Gribov <tetra2005@gmail.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Sasha Levin <sasha.levin@oracle.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 393f203f

arch/x86/include/asm/page_64_types.h

+9 −3
Original line number Diff line number Diff line 
#ifndef _ASM_X86_PAGE_64_DEFS_H

#define _ASM_X86_PAGE_64_DEFS_H



#define THREAD_SIZE_ORDER	2

#ifdef CONFIG_KASAN

#define KASAN_STACK_ORDER 1

#else

#define KASAN_STACK_ORDER 0

#endif



#define THREAD_SIZE_ORDER	(2 + KASAN_STACK_ORDER)

#define THREAD_SIZE  (PAGE_SIZE << THREAD_SIZE_ORDER)

#define CURRENT_MASK (~(THREAD_SIZE - 1))



#define EXCEPTION_STACK_ORDER 0

#define EXCEPTION_STACK_ORDER (0 + KASAN_STACK_ORDER)

#define EXCEPTION_STKSZ (PAGE_SIZE << EXCEPTION_STACK_ORDER)



#define DEBUG_STACK_ORDER (EXCEPTION_STACK_ORDER + 1)

#define DEBUG_STKSZ (PAGE_SIZE << DEBUG_STACK_ORDER)



#define IRQ_STACK_ORDER 2

#define IRQ_STACK_ORDER (2 + KASAN_STACK_ORDER)

#define IRQ_STACK_SIZE (PAGE_SIZE << IRQ_STACK_ORDER)



#define DOUBLEFAULT_STACK 1

arch/x86/kernel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ CFLAGS_REMOVE_early_printk.o = -pg 
endif



KASAN_SANITIZE_head$(BITS).o := n

KASAN_SANITIZE_dumpstack.o := n

KASAN_SANITIZE_dumpstack_$(BITS).o := n



CFLAGS_irq.o := -I$(src)/../include/asm/trace

arch/x86/mm/kasan_init_64.c

+9 −2
Original line number Diff line number Diff line
@@ -189,11 +189,18 @@ void __init kasan_init(void) 
		if (map_range(&pfn_mapped[i]))

			panic("kasan: unable to allocate shadow!");

	}



	populate_zero_shadow(kasan_mem_to_shadow((void *)PAGE_OFFSET + MAXMEM),

			kasan_mem_to_shadow((void *)__START_KERNEL_map));



	vmemmap_populate((unsigned long)kasan_mem_to_shadow(_stext),

			(unsigned long)kasan_mem_to_shadow(_end),

			NUMA_NO_NODE);



	populate_zero_shadow(kasan_mem_to_shadow((void *)MODULES_VADDR),

			(void *)KASAN_SHADOW_END);



	memset(kasan_zero_page, 0, PAGE_SIZE);



	load_cr3(init_level4_pgt);

	init_task.kasan_depth = 0;

}

include/linux/init_task.h

+8 −0
Original line number Diff line number Diff line
@@ -175,6 +175,13 @@ extern struct task_group root_task_group; 
# define INIT_NUMA_BALANCING(tsk)

#endif



#ifdef CONFIG_KASAN

# define INIT_KASAN(tsk)						\

	.kasan_depth = 1,

#else

# define INIT_KASAN(tsk)

#endif



/*

 *  INIT_TASK is used to set up the first task table, touch at

 * your own risk!. Base=0, limit=0x1fffff (=2MB)
@@ -250,6 +257,7 @@ extern struct task_group root_task_group; 
	INIT_RT_MUTEXES(tsk)						\

	INIT_VTIME(tsk)							\

	INIT_NUMA_BALANCING(tsk)					\

	INIT_KASAN(tsk)							\

}

mm/kasan/kasan.h

+9 −0
Original line number Diff line number Diff line
@@ -12,6 +12,15 @@ 
#define KASAN_KMALLOC_REDZONE   0xFC  /* redzone inside slub object */

#define KASAN_KMALLOC_FREE      0xFB  /* object was freed (kmem_cache_free/kfree) */



/*

 * Stack redzone shadow values

 * (Those are compiler's ABI, don't change them)

 */

#define KASAN_STACK_LEFT        0xF1

#define KASAN_STACK_MID         0xF2

#define KASAN_STACK_RIGHT       0xF3

#define KASAN_STACK_PARTIAL     0xF4





struct kasan_access_info {

	const void *access_addr;