summaryrefslogtreecommitdiffstats
path: root/mm/kasan/tags.c
diff options
context:
space:
mode:
authorAndrey Konovalov <andreyknvl@google.com>2023-12-21 19:35:39 +0100
committerAndrew Morton <akpm@linux-foundation.org>2023-12-29 11:58:46 -0800
commitfd4064f69708bc84d960b666896715fe86882c85 (patch)
tree3738f707c74a76bef3b9658ab895bcacb995cd7c /mm/kasan/tags.c
parent04afc540e58e8f66fd85b0b88af3e8ce286be17c (diff)
downloadlinux-stable-fd4064f69708bc84d960b666896715fe86882c85.tar.gz
linux-stable-fd4064f69708bc84d960b666896715fe86882c85.tar.bz2
linux-stable-fd4064f69708bc84d960b666896715fe86882c85.zip
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>
Diffstat (limited to 'mm/kasan/tags.c')
-rw-r--r--mm/kasan/tags.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c
index c4d14dbf27c0..d65d48b85f90 100644
--- 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;