Browse Source

s390/kasan: avoid vdso instrumentation

vdso is mapped into user space processes, which won't have kasan
shodow mapped.

Reviewed-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Vasily Gorbik 7 years ago
parent
commit
3484984585
2 changed files with 4 additions and 2 deletions
  1. 2 1
      arch/s390/kernel/vdso32/Makefile
  2. 2 1
      arch/s390/kernel/vdso64/Makefile

+ 2 - 1
arch/s390/kernel/vdso32/Makefile

@@ -28,9 +28,10 @@ obj-y += vdso32_wrapper.o
 extra-y += vdso32.lds
 extra-y += vdso32.lds
 CPPFLAGS_vdso32.lds += -P -C -U$(ARCH)
 CPPFLAGS_vdso32.lds += -P -C -U$(ARCH)
 
 
-# Disable gcov profiling and ubsan for VDSO code
+# Disable gcov profiling, ubsan and kasan for VDSO code
 GCOV_PROFILE := n
 GCOV_PROFILE := n
 UBSAN_SANITIZE := n
 UBSAN_SANITIZE := n
+KASAN_SANITIZE := n
 
 
 # Force dependency (incbin is bad)
 # Force dependency (incbin is bad)
 $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so
 $(obj)/vdso32_wrapper.o : $(obj)/vdso32.so

+ 2 - 1
arch/s390/kernel/vdso64/Makefile

@@ -28,9 +28,10 @@ obj-y += vdso64_wrapper.o
 extra-y += vdso64.lds
 extra-y += vdso64.lds
 CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 CPPFLAGS_vdso64.lds += -P -C -U$(ARCH)
 
 
-# Disable gcov profiling and ubsan for VDSO code
+# Disable gcov profiling, ubsan and kasan for VDSO code
 GCOV_PROFILE := n
 GCOV_PROFILE := n
 UBSAN_SANITIZE := n
 UBSAN_SANITIZE := n
+KASAN_SANITIZE := n
 
 
 # Force dependency (incbin is bad)
 # Force dependency (incbin is bad)
 $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so
 $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so