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

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

mm/kasan: add API to check memory regions 

Memory access coded in an assembly won't be seen by KASAN as a compiler
can instrument only C code.  Add kasan_check_[read,write]() API which is
going to be used to check a certain memory range.

Link: http://lkml.kernel.org/r/1462538722-1574-3-git-send-email-aryabinin@virtuozzo.com


Signed-off-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
Acked-by: default avatarAlexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 936bb4bb

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6242,7 +6242,7 @@ S: Maintained 
F:	arch/*/include/asm/kasan.h

F:	arch/*/mm/kasan_init*

F:	Documentation/kasan.txt

F:	include/linux/kasan.h

F:	include/linux/kasan*.h

F:	lib/test_kasan.c

F:	mm/kasan/

F:	scripts/Makefile.kasan

include/linux/kasan-checks.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#ifndef _LINUX_KASAN_CHECKS_H

#define _LINUX_KASAN_CHECKS_H



#ifdef CONFIG_KASAN

void kasan_check_read(const void *p, unsigned int size);

void kasan_check_write(const void *p, unsigned int size);

#else

static inline void kasan_check_read(const void *p, unsigned int size) { }

static inline void kasan_check_write(const void *p, unsigned int size) { }

#endif



#endif

mm/kasan/kasan.c

+12 −0
Original line number Diff line number Diff line
@@ -299,6 +299,18 @@ static void check_memory_region(unsigned long addr, 
	check_memory_region_inline(addr, size, write, ret_ip);

}



void kasan_check_read(const void *p, unsigned int size)

{

	check_memory_region((unsigned long)p, size, false, _RET_IP_);

}

EXPORT_SYMBOL(kasan_check_read);



void kasan_check_write(const void *p, unsigned int size)

{

	check_memory_region((unsigned long)p, size, true, _RET_IP_);

}

EXPORT_SYMBOL(kasan_check_write);



#undef memset

void *memset(void *addr, int c, size_t len)

{