Commit c249f9af authored by Andrey Konovalov's avatar Andrey Konovalov Committed by Andrew Morton

kasan: rename kasan_set_*_info to kasan_save_*_info

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.comSigned-off-by: default avatarAndrey Konovalov <andreyknvl@google.com>
Reviewed-by: default avatarMarco 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent ca77f290
...@@ -365,7 +365,7 @@ static inline bool ____kasan_slab_free(struct kmem_cache *cache, void *object, ...@@ -365,7 +365,7 @@ static inline bool ____kasan_slab_free(struct kmem_cache *cache, void *object,
return false; return false;
if (kasan_stack_collection_enabled()) 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); return kasan_quarantine_put(cache, object);
} }
...@@ -424,7 +424,7 @@ void __kasan_slab_free_mempool(void *ptr, unsigned long ip) ...@@ -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) gfp_t flags, bool is_kmalloc)
{ {
struct kasan_alloc_meta *alloc_meta; struct kasan_alloc_meta *alloc_meta;
...@@ -468,7 +468,7 @@ void * __must_check __kasan_slab_alloc(struct kmem_cache *cache, ...@@ -468,7 +468,7 @@ void * __must_check __kasan_slab_alloc(struct kmem_cache *cache,
/* Save alloc info (if possible) for non-kmalloc() allocations. */ /* Save alloc info (if possible) for non-kmalloc() allocations. */
if (kasan_stack_collection_enabled()) if (kasan_stack_collection_enabled())
set_alloc_info(cache, (void *)object, flags, false); save_alloc_info(cache, (void *)object, flags, false);
return tagged_object; return tagged_object;
} }
...@@ -514,7 +514,7 @@ static inline void *____kasan_kmalloc(struct kmem_cache *cache, ...@@ -514,7 +514,7 @@ static inline void *____kasan_kmalloc(struct kmem_cache *cache,
* This also rewrites the alloc info when called from kasan_krealloc(). * This also rewrites the alloc info when called from kasan_krealloc().
*/ */
if (kasan_stack_collection_enabled()) 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(). */ /* Keep the tag that was set by kasan_slab_alloc(). */
return (void *)object; return (void *)object;
......
...@@ -358,7 +358,7 @@ void kasan_record_aux_stack_noalloc(void *addr) ...@@ -358,7 +358,7 @@ void kasan_record_aux_stack_noalloc(void *addr)
return __kasan_record_aux_stack(addr, false); 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) void *object, u8 tag)
{ {
struct kasan_free_meta *free_meta; struct kasan_free_meta *free_meta;
......
...@@ -285,7 +285,7 @@ struct slab *kasan_addr_to_slab(const void *addr); ...@@ -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); 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_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, struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,
void *object, u8 tag); void *object, u8 tag);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "kasan.h" #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) void *object, u8 tag)
{ {
struct kasan_alloc_meta *alloc_meta; struct kasan_alloc_meta *alloc_meta;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment