Commit f7e01ab8 authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Andrew Morton
Browse files

kasan: move tests to mm/kasan/ 

Move KASAN tests to mm/kasan/ to keep the test code alongside the
implementation.

Link: https://lkml.kernel.org/r/676398f0aeecd47d2f8e3369ea0e95563f641a36.1662416260.git.andreyknvl@google.com


Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarMarco Elver <elver@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Marco Elver <elver@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 34b592ce

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -10938,7 +10938,6 @@ F: arch/*/include/asm/*kasan.h 
F:	arch/*/mm/kasan_init*

F:	include/linux/kasan*.h

F:	lib/Kconfig.kasan

F:	lib/test_kasan*.c

F:	mm/kasan/

F:	scripts/Makefile.kasan
































lib/Makefile



+0
−5






























Original line number
Diff line number
Diff line







@@ -65,11 +65,6 @@ obj-$(CONFIG_TEST_SYSCTL) += test_sysctl.o







obj-$(CONFIG_TEST_SIPHASH) += test_siphash.o









obj-$(CONFIG_HASH_KUNIT_TEST) += test_hash.o









obj-$(CONFIG_TEST_IDA) += test_ida.o









obj-$(CONFIG_KASAN_KUNIT_TEST) += test_kasan.o









CFLAGS_test_kasan.o += -fno-builtin









CFLAGS_test_kasan.o += $(call cc-disable-warning, vla)









obj-$(CONFIG_KASAN_MODULE_TEST) += test_kasan_module.o









CFLAGS_test_kasan_module.o += -fno-builtin









obj-$(CONFIG_TEST_UBSAN) += test_ubsan.o









CFLAGS_test_ubsan.o += $(call cc-disable-warning, vla)









UBSAN_SANITIZE_test_ubsan.o := y
































mm/kasan/Makefile



+8
−0






























Original line number
Diff line number
Diff line







@@ -35,7 +35,15 @@ CFLAGS_shadow.o := $(CC_FLAGS_KASAN_RUNTIME)







CFLAGS_hw_tags.o := $(CC_FLAGS_KASAN_RUNTIME)









CFLAGS_sw_tags.o := $(CC_FLAGS_KASAN_RUNTIME)



















CFLAGS_KASAN_TEST := $(CFLAGS_KASAN) -fno-builtin $(call cc-disable-warning, vla)



















CFLAGS_kasan_test.o := $(CFLAGS_KASAN_TEST)









CFLAGS_kasan_test_module.o := $(CFLAGS_KASAN_TEST)



















obj-y := common.o report.o









obj-$(CONFIG_KASAN_GENERIC) += init.o generic.o report_generic.o shadow.o quarantine.o









obj-$(CONFIG_KASAN_HW_TAGS) += hw_tags.o report_hw_tags.o tags.o report_tags.o









obj-$(CONFIG_KASAN_SW_TAGS) += init.o report_sw_tags.o shadow.o sw_tags.o tags.o report_tags.o



















obj-$(CONFIG_KASAN_KUNIT_TEST) += kasan_test.o









obj-$(CONFIG_KASAN_MODULE_TEST) += kasan_test_module.o
























lib/test_kasan.c→mm/kasan/kasan_test.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -25,7 +25,7 @@

















#include <kunit/test.h>



















#include "../mm/kasan/kasan.h"









#include "kasan.h"



















#define OOB_TAG_OFF (IS_ENABLED(CONFIG_KASAN_GENERIC) ? 0 : KASAN_GRANULE_SIZE)










































lib/test_kasan_module.c→mm/kasan/kasan_test_module.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -13,7 +13,7 @@







#include <linux/slab.h>









#include <linux/uaccess.h>



















#include "../mm/kasan/kasan.h"









#include "kasan.h"



















static noinline void __init copy_user_test(void)









{