kasan-check-config_kasan_kunit_test-instead-of-config_kunit.patch removed from -mm tree
The patch titled
Subject: kasan: check CONFIG_KASAN_KUNIT_TEST instead of CONFIG_KUNIT
has been removed from the -mm tree. Its filename was
kasan-check-config_kasan_kunit_test-instead-of-config_kunit.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: 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.
---
mm/kasan/kasan.h | 18 ++++++++---------- mm/kasan/report.c | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-)
mm/kasan/kasan.h renamed from mm/kasan/kasan.h~kasan-check-config_kasan_kunit_test-instead-of-config_kunit +8 -10
@@ -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 renamed from mm/kasan/report.c~kasan-check-config_kasan_kunit_test-instead-of-config_kunit +1 -1
@@ -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;
_
Patches currently in -mm which might be from [email protected] are
stacktrace-add-interface-based-on-shadow-call-stack.patch arm64-scs-save-scs_sp-values-per-cpu-when-switching-stacks.patch arm64-implement-stack_trace_save_shadow.patch kasan-use-stack_trace_save_shadow.patch