kasan-add-wrappers-for-vmalloc-hooks.patch removed from -mm tree

merged Andrew Morton 1 participant 1 message Mar 25, 2022

Share & tools

Andrew Morton

author tree notice Applied

2022-03-25 22:42 UTC #0 lore raw

The patch titled
Subject: kasan: add wrappers for vmalloc hooks
has been removed from the -mm tree. Its filename was
kasan-add-wrappers-for-vmalloc-hooks.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: kasan: add wrappers for vmalloc hooks

Add wrappers around functions that [un]poison memory for vmalloc allocations. These functions will be used by HW_TAGS KASAN and therefore need to be disabled when kasan=off command line argument is provided.

This patch does no functional changes for software KASAN modes.

Link https://lkml.kernel.org/r/3b8728eac438c55389fb0f9a8a2145d71dd77487.1643047180.git.andreyknvl@google.com open here

Signed-off-by Andrey Konovalov <[email protected]>

Reviewed-by Alexander Potapenko <[email protected]>

Acked-by Marco Elver <[email protected]>

Cc Andrey Ryabinin <[email protected]>

Cc Catalin Marinas <[email protected]>

Cc Dmitry Vyukov <[email protected]>

Cc Evgenii Stepanov <[email protected]>

Cc Mark Rutland <[email protected]>

Cc Peter Collingbourne <[email protected]>

Cc Vincenzo Frascino <[email protected]>

Cc Will Deacon <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 include/linux/kasan.h |   17 +++++++++++++++--
 mm/kasan/shadow.c     |    5 ++---
 2 files changed, 17 insertions(+), 5 deletions(-)

include/linux/kasan.h renamed from include/linux/kasan.h~kasan-add-wrappers-for-vmalloc-hooks +15 -2

@@ -403,8 +403,21 @@ void kasan_release_vmalloc(unsigned long
 			   unsigned long free_region_start,
 			   unsigned long free_region_end);
 
-void kasan_unpoison_vmalloc(const void *start, unsigned long size);
-void kasan_poison_vmalloc(const void *start, unsigned long size);
+void __kasan_unpoison_vmalloc(const void *start, unsigned long size);
+static __always_inline void kasan_unpoison_vmalloc(const void *start,
+						   unsigned long size)
+{
+	if (kasan_enabled())
+		__kasan_unpoison_vmalloc(start, size);
+}
+
+void __kasan_poison_vmalloc(const void *start, unsigned long size);
+static __always_inline void kasan_poison_vmalloc(const void *start,
+						 unsigned long size)
+{
+	if (kasan_enabled())
+		__kasan_poison_vmalloc(start, size);
+}
 
 #else /* CONFIG_KASAN_VMALLOC */

mm/kasan/shadow.c renamed from mm/kasan/shadow.c~kasan-add-wrappers-for-vmalloc-hooks +2 -3

@@ -475,8 +475,7 @@ void kasan_release_vmalloc(unsigned long
 	}
 }
 
-
-void kasan_unpoison_vmalloc(const void *start, unsigned long size)
+void __kasan_unpoison_vmalloc(const void *start, unsigned long size)
 {
 	if (!is_vmalloc_or_module_addr(start))
 		return;

@@ -488,7 +487,7 @@ void kasan_unpoison_vmalloc(const void *
  * Poison the shadow for a vmalloc region. Called as part of the
  * freeing process at the time the region is freed.
  */
-void kasan_poison_vmalloc(const void *start, unsigned long size)
+void __kasan_poison_vmalloc(const void *start, unsigned long size)
 {
 	if (!is_vmalloc_or_module_addr(start))
 		return;

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