Skip to contentSkip to conversation

kasan-pass-tagged-pointers-to-kasan_save_alloc-free_info.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Oct 3, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: kasan: pass tagged pointers to kasan_save_alloc/free_info
has been removed from the -mm tree. Its filename was
kasan-pass-tagged-pointers-to-kasan_save_alloc-free_info.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Andrey Konovalov <[email protected]>
Subject: kasan: pass tagged pointers to kasan_save_alloc/free_info
Date: Mon, 5 Sep 2022 23:05:34 +0200

Pass tagged pointers to kasan_save_alloc/free_info().

This is a preparatory patch to simplify other changes in the series.

Link https://lkml.kernel.org/r/d5bc48cfcf0dca8269dc3ed863047e4d4d2030f1.1662411799.git.andreyknvl@google.com open here
Signed-off-by Andrey Konovalov <[email protected]>
Reviewed-by Marco Elver <[email protected]>
Cc Alexander Potapenko <[email protected]>
Cc Andrey Ryabinin <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Evgenii Stepanov <[email protected]>
Cc Peter Collingbourne <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 mm/kasan/common.c  |    6 ++----
 mm/kasan/generic.c |    3 +--
 mm/kasan/kasan.h   |    2 +-
 mm/kasan/tags.c    |    3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)
mm/kasan/common.c renamed from mm/kasan/common.c~kasan-pass-tagged-pointers-to-kasan_save_alloc-free_info +2 -4
@@ -193,13 +193,11 @@ void * __must_check __kasan_init_slab_ob
 static inline bool ____kasan_slab_free(struct kmem_cache *cache, void *object,
 				unsigned long ip, bool quarantine, bool init)
 {
-	u8 tag;
 	void *tagged_object;
 
 	if (!kasan_arch_is_ready())
 		return false;
 
-	tag = get_tag(object);
 	tagged_object = object;
 	object = kasan_reset_tag(object);
 

@@ -228,7 +226,7 @@ static inline bool ____kasan_slab_free(s
 		return false;
 
 	if (kasan_stack_collection_enabled())
-		kasan_save_free_info(cache, object, tag);
+		kasan_save_free_info(cache, tagged_object);
 
 	return kasan_quarantine_put(cache, object);
 }

@@ -317,7 +315,7 @@ void * __must_check __kasan_slab_alloc(s
 
 	/* Save alloc info (if possible) for non-kmalloc() allocations. */
 	if (kasan_stack_collection_enabled() && !cache->kasan_info.is_kmalloc)
-		kasan_save_alloc_info(cache, (void *)object, flags);
+		kasan_save_alloc_info(cache, tagged_object, flags);
 
 	return tagged_object;
 }
mm/kasan/generic.c renamed from mm/kasan/generic.c~kasan-pass-tagged-pointers-to-kasan_save_alloc-free_info +1 -2
@@ -500,8 +500,7 @@ void kasan_save_alloc_info(struct kmem_c
 		kasan_set_track(&alloc_meta->alloc_track, flags);
 }
 
-void kasan_save_free_info(struct kmem_cache *cache,
-				void *object, u8 tag)
+void kasan_save_free_info(struct kmem_cache *cache, void *object)
 {
 	struct kasan_free_meta *free_meta;
mm/kasan/kasan.h renamed from mm/kasan/kasan.h~kasan-pass-tagged-pointers-to-kasan_save_alloc-free_info +1 -1
@@ -309,7 +309,7 @@ static inline void kasan_init_object_met
 depot_stack_handle_t kasan_save_stack(gfp_t flags, bool can_alloc);
 void kasan_set_track(struct kasan_track *track, gfp_t flags);
 void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags);
-void kasan_save_free_info(struct kmem_cache *cache, void *object, u8 tag);
+void kasan_save_free_info(struct kmem_cache *cache, void *object);
 struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache,
 						void *object);
 struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,
mm/kasan/tags.c renamed from mm/kasan/tags.c~kasan-pass-tagged-pointers-to-kasan_save_alloc-free_info +1 -2
@@ -21,8 +21,7 @@ void kasan_save_alloc_info(struct kmem_c
 {
 }
 
-void kasan_save_free_info(struct kmem_cache *cache,
-				void *object, u8 tag)
+void kasan_save_free_info(struct kmem_cache *cache, void *object)
 {
 }

_

Patches currently in -mm which might be from [email protected] are

kasan-fix-array-bounds-warnings-in-tests.patch