kasan: pass tagged pointers to kasan_save_alloc/free_info

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
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>

diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 8efa6319095146a28854ebae9da19501d0fb1f05..f8e16a24219788489bb939c020e375e83951d944 100644 (file)
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -193,13 +193,11 @@ void * __must_check __kasan_init_slab_obj(struct kmem_cache *cache,
 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(struct kmem_cache *cache, void *object,
                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(struct kmem_cache *cache,
 
        /* 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;
 }

diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c
index f6bef347de870d9c794c3ebfd8e2eb9260eba8fb..aff39af3c532a9b3dfb999e98f0009db3624cc13 100644 (file)
--- a/mm/kasan/generic.c
+++ b/mm/kasan/generic.c
@@ -500,8 +500,7 @@ void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags)
                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;
 

diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index cae60e4d88426fc420eb8942f27f6ea2aa045817..cca49ab029f1c564628de52faac2e916b515f7bd 100644 (file)
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -309,7 +309,7 @@ static inline void kasan_init_object_meta(struct kmem_cache *cache, const void *
 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,

diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c
index 4f24669085e9296f4f11e1d8d22bc05ccedd6f12..fd11d10a4ffc60c3ef3d619ab6e34b277b110c31 100644 (file)
--- a/mm/kasan/tags.c
+++ b/mm/kasan/tags.c
@@ -21,8 +21,7 @@ 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)
 {
 }