kasan: simplify saving extra info into tracks

Avoid duplicating code for saving extra info into tracks: reuse the common
function for this.

Link: https://lkml.kernel.org/r/20231221183540.168428-3-andrey.konovalov@linux.dev
Fixes: 5d4c6ac94694 ("kasan: record and report more information")
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: Juntong Deng <juntong.deng@outlook.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index 86adf80cc11a6dbeadd7f42c3acd1002d2fde548..a486e9b1ac68e39bdabf008f7ec74bf8554bc730 100644 (file)
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -48,7 +48,7 @@ depot_stack_handle_t kasan_save_stack(gfp_t flags, depot_flags_t depot_flags)
        return stack_depot_save_flags(entries, nr_entries, flags, depot_flags);
 }
 
-void kasan_set_track(struct kasan_track *track, gfp_t flags)
+void kasan_set_track(struct kasan_track *track, depot_stack_handle_t stack)
 {
 #ifdef CONFIG_KASAN_EXTRA_INFO
        u32 cpu = raw_smp_processor_id();
@@ -58,8 +58,16 @@ void kasan_set_track(struct kasan_track *track, gfp_t flags)
        track->timestamp = ts_nsec >> 3;
 #endif /* CONFIG_KASAN_EXTRA_INFO */
        track->pid = current->pid;
-       track->stack = kasan_save_stack(flags,
+       track->stack = stack;
+}
+
+void kasan_save_track(struct kasan_track *track, gfp_t flags)
+{
+       depot_stack_handle_t stack;
+
+       stack = kasan_save_stack(flags,
                        STACK_DEPOT_FLAG_CAN_ALLOC | STACK_DEPOT_FLAG_GET);
+       kasan_set_track(track, stack);
 }
 
 #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS)

diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c
index 5b3308127ce0c50f0d80faa0cdcc2ec869287a37..0e77c43c559e36a53c005a45b976ba5c36ebf2ad 100644 (file)
--- a/mm/kasan/generic.c
+++ b/mm/kasan/generic.c
@@ -579,7 +579,7 @@ void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags)
        stack_depot_put(alloc_meta->aux_stack[1]);
        __memset(alloc_meta, 0, sizeof(*alloc_meta));
 
-       kasan_set_track(&alloc_meta->alloc_track, flags);
+       kasan_save_track(&alloc_meta->alloc_track, flags);
 }
 
 void kasan_save_free_info(struct kmem_cache *cache, void *object)
@@ -590,7 +590,7 @@ void kasan_save_free_info(struct kmem_cache *cache, void *object)
        if (!free_meta)
                return;
 
-       kasan_set_track(&free_meta->free_track, 0);
+       kasan_save_track(&free_meta->free_track, 0);
        /* The object was freed and has free track set. */
        *(u8 *)kasan_mem_to_shadow(object) = KASAN_SLAB_FREETRACK;
 }

diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index a280bb04c0e614ef8dac7d7b242eb6119d8970c2..814e89523c64cc0aa52bd431bcb6481119301522 100644 (file)
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -392,7 +392,8 @@ static inline void kasan_init_object_meta(struct kmem_cache *cache, const void *
 #endif
 
 depot_stack_handle_t kasan_save_stack(gfp_t flags, depot_flags_t depot_flags);
-void kasan_set_track(struct kasan_track *track, gfp_t flags);
+void kasan_set_track(struct kasan_track *track, depot_stack_handle_t stack);
+void kasan_save_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);
 

diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c
index c4d14dbf27c05ade49a4491c3ac254b7e223596e..d65d48b85f90d914f8be5cd6d84ca57ac77d6014 100644 (file)
--- a/mm/kasan/tags.c
+++ b/mm/kasan/tags.c
@@ -94,17 +94,6 @@ void __init kasan_init_tags(void)
        }
 }
 
-#ifdef CONFIG_KASAN_EXTRA_INFO
-static void save_extra_info(struct kasan_stack_ring_entry *entry)
-{
-       u32 cpu = raw_smp_processor_id();
-       u64 ts_nsec = local_clock();
-
-       entry->track.cpu = cpu;
-       entry->track.timestamp = ts_nsec >> 3;
-}
-#endif /* CONFIG_KASAN_EXTRA_INFO */
-
 static void save_stack_info(struct kmem_cache *cache, void *object,
                        gfp_t gfp_flags, bool is_free)
 {
@@ -137,11 +126,7 @@ next:
        old_stack = entry->track.stack;
 
        entry->size = cache->object_size;
-       entry->track.pid = current->pid;
-       entry->track.stack = stack;
-#ifdef CONFIG_KASAN_EXTRA_INFO
-       save_extra_info(entry);
-#endif /* CONFIG_KASAN_EXTRA_INFO */
+       kasan_set_track(&entry->track, stack);
        entry->is_free = is_free;
 
        entry->ptr = object;