Commit 49d9977a authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Linus Torvalds
Browse files

kasan: check CONFIG_KASAN_KUNIT_TEST instead of CONFIG_KUNIT 

Check the more specific CONFIG_KASAN_KUNIT_TEST config option when
defining things related to KUnit-compatible KASAN tests instead of
CONFIG_KUNIT.

Also put the kunit_kasan_status definition next to the definitons of other
KASAN-related structs.

Link: https://lkml.kernel.org/r/223592d38d2a601a160a3b2b3d5a9f9090350e62.1646237226.git.andreyknvl@google.com


Signed-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarAlexander Potapenko <glider@google.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>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3784c299

mm/kasan/kasan.h

+8 −10
Original line number Diff line number Diff line
@@ -7,16 +7,6 @@ 
#include <linux/kfence.h>

#include <linux/stackdepot.h>



#if IS_ENABLED(CONFIG_KUNIT)



/* Used in KUnit-compatible KASAN tests. */

struct kunit_kasan_status {

	bool report_found;

	bool sync_fault;

};



#endif



#ifdef CONFIG_KASAN_HW_TAGS



#include <linux/static_key.h>
@@ -224,6 +214,14 @@ struct kasan_free_meta { 
#endif

};



#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST)

/* Used in KUnit-compatible KASAN tests. */

struct kunit_kasan_status {

	bool report_found;

	bool sync_fault;

};

#endif



struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache,

						const void *object);

#ifdef CONFIG_KASAN_GENERIC

mm/kasan/report.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static bool report_enabled(void) 
	return !test_and_set_bit(KASAN_BIT_REPORTED, &kasan_flags);

}



#if IS_ENABLED(CONFIG_KUNIT)

#if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST)

static void update_kunit_status(bool sync)

{

	struct kunit *test;