]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
kasan: rename kasan_set_*_info to kasan_save_*_info
authorAndrey Konovalov <andreyknvl@google.com>
Mon, 5 Sep 2022 21:05:17 +0000 (23:05 +0200)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 3 Oct 2022 21:02:56 +0000 (14:02 -0700)
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
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Reviewed-by: Marco Elver <elver@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Evgenii Stepanov <eugenis@google.com>
Cc: Peter Collingbourne <pcc@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/kasan/common.c
mm/kasan/generic.c
mm/kasan/kasan.h
mm/kasan/tags.c

index f6a6c7d0d8b8f235c1ebfdfa8e2a3e95e9906e09..90b6cadd2dac0d65c13a6ba6ef48a02d4cb6701e 100644 (file)
@@ -365,7 +365,7 @@ static inline bool ____kasan_slab_free(struct kmem_cache *cache, void *object,
                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, unsigned long ip)
        }
 }
 
-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(struct kmem_cache *cache,
 
        /* 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(struct kmem_cache *cache,
         * 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;
index 437fcc7e77cf277484d0b280b2f765468e3fcafc..03a3770cfeaec73f4d78af388e294dd13847214e 100644 (file)
@@ -358,7 +358,7 @@ void kasan_record_aux_stack_noalloc(void *addr)
        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;
index 01c03e45acd42afef5469ba3cf2e6d46a1233e06..bf16a74dc0276b43a9a6c6b60dc74fce9e33ec68 100644 (file)
@@ -285,7 +285,7 @@ struct slab *kasan_addr_to_slab(const void *addr);
 
 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);
 
index 8f48b9502a177dab50a66b47cff527bd8fb8ec83..b453a353bc862357e58a25f0bb0bb219ec1c749c 100644 (file)
@@ -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;