The following commit has been merged into the locking/kcsan branch of tip: Commit-ID: c29a59e43829beabc4c26036ebcc6a32dd0b6a01 Gitweb: https://git.kernel.org/tip/c29a59e43829beabc4c26036ebcc6a32dd0b6a01 Author: Jann Horn <jannh@xxxxxxxxxx> AuthorDate: Mon, 06 Jan 2020 21:02:04 +01:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Fri, 10 Jan 2020 16:47:32 +01:00 x86/vdso: Enable sanitizers for vma.o The vDSO makefile opts out of all sanitizers (and objtool validation); however, vma.o is a normal kernel object file (and already has objtool validation selectively enabled), so turn the sanitizers back on for that file. Signed-off-by: Jann Horn <jannh@xxxxxxxxxx> Cc: Andy Lutomirski <luto@xxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Marco Elver <elver@xxxxxxxxxx> Cc: Paul E. McKenney <paulmck@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20200106200204.94782-1-jannh@xxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- arch/x86/entry/vdso/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 0f46273..50a1c90 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -30,6 +30,9 @@ vobjs-y := vdso-note.o vclock_gettime.o vgetcpu.o # files to link into kernel obj-y += vma.o +KASAN_SANITIZE_vma.o := y +UBSAN_SANITIZE_vma.o := y +KCSAN_SANITIZE_vma.o := y OBJECT_FILES_NON_STANDARD_vma.o := n # vDSO images to build
|