summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Ryabinin <aryabinin@virtuozzo.com>2016-05-20 19:59:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-20 20:58:30 -0400
commit64f8ebaf115bcddc4aaa902f981c57ba6506bc42 (patch)
tree11f1cba5bc8867e085236ff96861ced9a29c943e
parent936bb4bbbb832f81055328b84e5afe1fc7246a8d (diff)
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: Andrey Ryabinin <aryabinin@virtuozzo.com> Acked-by: Alexander 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--MAINTAINERS2
-rw-r--r--include/linux/kasan-checks.h12
-rw-r--r--mm/kasan/kasan.c12
3 files changed, 25 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 374ffa2d81b7..8b92445561b6 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6242,7 +6242,7 @@ S: Maintained
6242F: arch/*/include/asm/kasan.h 6242F: arch/*/include/asm/kasan.h
6243F: arch/*/mm/kasan_init* 6243F: arch/*/mm/kasan_init*
6244F: Documentation/kasan.txt 6244F: Documentation/kasan.txt
6245F: include/linux/kasan.h 6245F: include/linux/kasan*.h
6246F: lib/test_kasan.c 6246F: lib/test_kasan.c
6247F: mm/kasan/ 6247F: mm/kasan/
6248F: scripts/Makefile.kasan 6248F: scripts/Makefile.kasan
diff --git a/include/linux/kasan-checks.h b/include/linux/kasan-checks.h
new file mode 100644
index 000000000000..b7f8aced7870
--- /dev/null
+++ b/include/linux/kasan-checks.h
@@ -0,0 +1,12 @@
1#ifndef _LINUX_KASAN_CHECKS_H
2#define _LINUX_KASAN_CHECKS_H
3
4#ifdef CONFIG_KASAN
5void kasan_check_read(const void *p, unsigned int size);
6void kasan_check_write(const void *p, unsigned int size);
7#else
8static inline void kasan_check_read(const void *p, unsigned int size) { }
9static inline void kasan_check_write(const void *p, unsigned int size) { }
10#endif
11
12#endif
diff --git a/mm/kasan/kasan.c b/mm/kasan/kasan.c
index e5beb40d97b1..18b6a2b8d183 100644
--- a/mm/kasan/kasan.c
+++ b/mm/kasan/kasan.c
@@ -299,6 +299,18 @@ static void check_memory_region(unsigned long addr,
299 check_memory_region_inline(addr, size, write, ret_ip); 299 check_memory_region_inline(addr, size, write, ret_ip);
300} 300}
301 301
302void kasan_check_read(const void *p, unsigned int size)
303{
304 check_memory_region((unsigned long)p, size, false, _RET_IP_);
305}
306EXPORT_SYMBOL(kasan_check_read);
307
308void kasan_check_write(const void *p, unsigned int size)
309{
310 check_memory_region((unsigned long)p, size, true, _RET_IP_);
311}
312EXPORT_SYMBOL(kasan_check_write);
313
302#undef memset 314#undef memset
303void *memset(void *addr, int c, size_t len) 315void *memset(void *addr, int c, size_t len)
304{ 316{