kasan-rename-kasan_set__info-to-kasan_save__info.patch removed from -mm tree

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

Share & tools

Andrew Morton

author tree notice Applied

2022-10-03 21:08 UTC #0 lore raw

The quilt patch titled
Subject: kasan: rename kasan_set_*_info to kasan_save_*_info
has been removed from the -mm tree. Its filename was
kasan-rename-kasan_set__info-to-kasan_save__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: rename kasan_set_*_info to kasan_save_*_info
Date: Mon, 5 Sep 2022 23:05:17 +0200

Rename set_alloc_info() and kasan_set_free_info() to save_alloc_info() and kasan_save_free_info(). The new names make more sense.

Link https://lkml.kernel.org/r/9f04777a15cb9d96bf00331da98e021d732fe1c9.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  |    8 ++++----
 mm/kasan/generic.c |    2 +-
 mm/kasan/kasan.h   |    2 +-
 mm/kasan/tags.c    |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

mm/kasan/common.c renamed from mm/kasan/common.c~kasan-rename-kasan_set__info-to-kasan_save__info +4 -4

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

@@ -424,7 +424,7 @@ void __kasan_slab_free_mempool(void *ptr
 	}
 }
 
-static void set_alloc_info(struct kmem_cache *cache, void *object,
+static void save_alloc_info(struct kmem_cache *cache, void *object,
 				gfp_t flags, bool is_kmalloc)
 {
 	struct kasan_alloc_meta *alloc_meta;

@@ -468,7 +468,7 @@ void * __must_check __kasan_slab_alloc(s
 
 	/* Save alloc info (if possible) for non-kmalloc() allocations. */
 	if (kasan_stack_collection_enabled())
-		set_alloc_info(cache, (void *)object, flags, false);
+		save_alloc_info(cache, (void *)object, flags, false);
 
 	return tagged_object;
 }

@@ -514,7 +514,7 @@ static inline void *____kasan_kmalloc(st
 	 * This also rewrites the alloc info when called from kasan_krealloc().
 	 */
 	if (kasan_stack_collection_enabled())
-		set_alloc_info(cache, (void *)object, flags, true);
+		save_alloc_info(cache, (void *)object, flags, true);
 
 	/* Keep the tag that was set by kasan_slab_alloc(). */
 	return (void *)object;

mm/kasan/generic.c renamed from mm/kasan/generic.c~kasan-rename-kasan_set__info-to-kasan_save__info +1 -1

@@ -358,7 +358,7 @@ void kasan_record_aux_stack_noalloc(void
 	return __kasan_record_aux_stack(addr, false);
 }
 
-void kasan_set_free_info(struct kmem_cache *cache,
+void kasan_save_free_info(struct kmem_cache *cache,
 				void *object, u8 tag)
 {
 	struct kasan_free_meta *free_meta;

mm/kasan/kasan.h renamed from mm/kasan/kasan.h~kasan-rename-kasan_set__info-to-kasan_save__info +1 -1

@@ -285,7 +285,7 @@ struct slab *kasan_addr_to_slab(const vo
 
 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_set_free_info(struct kmem_cache *cache, void *object, u8 tag);
+void kasan_save_free_info(struct kmem_cache *cache, void *object, u8 tag);
 struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,
 				void *object, u8 tag);

mm/kasan/tags.c renamed from mm/kasan/tags.c~kasan-rename-kasan_set__info-to-kasan_save__info +1 -1

@@ -17,7 +17,7 @@
 
 #include "kasan.h"
 
-void kasan_set_free_info(struct kmem_cache *cache,
+void kasan_save_free_info(struct kmem_cache *cache,
 				void *object, u8 tag)
 {
 	struct kasan_alloc_meta *alloc_meta;

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

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