diff options
| author | Alexander Potapenko | 2016-07-29 00:49:07 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-07-29 01:07:41 +0200 |
| commit | 80a9201a5965f4715d5c09790862e0df84ce0614 (patch) | |
| tree | e05d44a7f9ef0d81328dc4bd70f23656fc279bc9 /mm/kasan/Makefile | |
| parent | mm, kasan: account for object redzone in SLUB's nearest_obj() (diff) | |
| download | kernel-qcow2-linux-80a9201a5965f4715d5c09790862e0df84ce0614.tar.gz kernel-qcow2-linux-80a9201a5965f4715d5c09790862e0df84ce0614.tar.xz kernel-qcow2-linux-80a9201a5965f4715d5c09790862e0df84ce0614.zip | |
mm, kasan: switch SLUB to stackdepot, enable memory quarantine for SLUB
For KASAN builds:
- switch SLUB allocator to using stackdepot instead of storing the
allocation/deallocation stacks in the objects;
- change the freelist hook so that parts of the freelist can be put
into the quarantine.
[aryabinin@virtuozzo.com: fixes]
Link: http://lkml.kernel.org/r/1468601423-28676-1-git-send-email-aryabinin@virtuozzo.com
Link: http://lkml.kernel.org/r/1468347165-41906-3-git-send-email-glider@google.com
Signed-off-by: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <adech.fo@gmail.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Steven Rostedt (Red Hat) <rostedt@goodmis.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Kostya Serebryany <kcc@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Kuthonuzo Luruo <kuthonuzo.luruo@hpe.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/kasan/Makefile')
| -rw-r--r-- | mm/kasan/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/kasan/Makefile b/mm/kasan/Makefile index 1548749a3d45..2976a9ee104f 100644 --- a/mm/kasan/Makefile +++ b/mm/kasan/Makefile @@ -7,5 +7,4 @@ CFLAGS_REMOVE_kasan.o = -pg # see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63533 CFLAGS_kasan.o := $(call cc-option, -fno-conserve-stack -fno-stack-protector) -obj-y := kasan.o report.o kasan_init.o -obj-$(CONFIG_SLAB) += quarantine.o +obj-y := kasan.o report.o kasan_init.o quarantine.o |