The quilt patch titled
Subject: kasan: reuse kasan_track in kasan_stack_ring_entry
has been removed from the -mm tree. Its filename was
kasan-reuse-kasan_track-in-kasan_stack_ring_entry.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
Subject: kasan: reuse kasan_track in kasan_stack_ring_entry
Date: Thu, 21 Dec 2023 19:35:38 +0100
Avoid duplicating fields of kasan_track in kasan_stack_ring_entry: reuse
the structure.
Link: https://lkml.kernel.org/r/20231221183540.168428-2-andrey.konovalov@xxxxxxxxx
Fixes: 5d4c6ac94694 ("kasan: record and report more information")
Signed-off-by: Andrey Konovalov <andreyknvl@xxxxxxxxxx>
Reviewed-by: Marco Elver <elver@xxxxxxxxxx>
Cc: Alexander Potapenko <glider@xxxxxxxxxx>
Cc: Andrey Ryabinin <ryabinin.a.a@xxxxxxxxx>
Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
Cc: Juntong Deng <juntong.deng@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/kasan/kasan.h | 7 +------
mm/kasan/report_tags.c | 12 ++++++------
mm/kasan/tags.c | 12 ++++++------
3 files changed, 13 insertions(+), 18 deletions(-)
--- a/mm/kasan/kasan.h~kasan-reuse-kasan_track-in-kasan_stack_ring_entry
+++ a/mm/kasan/kasan.h
@@ -293,13 +293,8 @@ struct kasan_free_meta {
struct kasan_stack_ring_entry {
void *ptr;
size_t size;
- u32 pid;
- depot_stack_handle_t stack;
+ struct kasan_track track;
bool is_free;
-#ifdef CONFIG_KASAN_EXTRA_INFO
- u64 cpu:20;
- u64 timestamp:44;
-#endif /* CONFIG_KASAN_EXTRA_INFO */
};
struct kasan_stack_ring {
--- a/mm/kasan/report_tags.c~kasan-reuse-kasan_track-in-kasan_stack_ring_entry
+++ a/mm/kasan/report_tags.c
@@ -31,8 +31,8 @@ static const char *get_common_bug_type(s
static void kasan_complete_extra_report_info(struct kasan_track *track,
struct kasan_stack_ring_entry *entry)
{
- track->cpu = entry->cpu;
- track->timestamp = entry->timestamp;
+ track->cpu = entry->track.cpu;
+ track->timestamp = entry->track.timestamp;
}
#endif /* CONFIG_KASAN_EXTRA_INFO */
@@ -80,8 +80,8 @@ void kasan_complete_mode_report_info(str
if (free_found)
break;
- info->free_track.pid = entry->pid;
- info->free_track.stack = entry->stack;
+ info->free_track.pid = entry->track.pid;
+ info->free_track.stack = entry->track.stack;
#ifdef CONFIG_KASAN_EXTRA_INFO
kasan_complete_extra_report_info(&info->free_track, entry);
#endif /* CONFIG_KASAN_EXTRA_INFO */
@@ -98,8 +98,8 @@ void kasan_complete_mode_report_info(str
if (alloc_found)
break;
- info->alloc_track.pid = entry->pid;
- info->alloc_track.stack = entry->stack;
+ info->alloc_track.pid = entry->track.pid;
+ info->alloc_track.stack = entry->track.stack;
#ifdef CONFIG_KASAN_EXTRA_INFO
kasan_complete_extra_report_info(&info->alloc_track, entry);
#endif /* CONFIG_KASAN_EXTRA_INFO */
--- a/mm/kasan/tags.c~kasan-reuse-kasan_track-in-kasan_stack_ring_entry
+++ a/mm/kasan/tags.c
@@ -100,8 +100,8 @@ static void save_extra_info(struct kasan
u32 cpu = raw_smp_processor_id();
u64 ts_nsec = local_clock();
- entry->cpu = cpu;
- entry->timestamp = ts_nsec >> 3;
+ entry->track.cpu = cpu;
+ entry->track.timestamp = ts_nsec >> 3;
}
#endif /* CONFIG_KASAN_EXTRA_INFO */
@@ -134,15 +134,15 @@ next:
if (!try_cmpxchg(&entry->ptr, &old_ptr, STACK_RING_BUSY_PTR))
goto next; /* Busy slot. */
- old_stack = entry->stack;
+ old_stack = entry->track.stack;
entry->size = cache->object_size;
- entry->pid = current->pid;
- entry->stack = stack;
- entry->is_free = is_free;
+ entry->track.pid = current->pid;
+ entry->track.stack = stack;
#ifdef CONFIG_KASAN_EXTRA_INFO
save_extra_info(entry);
#endif /* CONFIG_KASAN_EXTRA_INFO */
+ entry->is_free = is_free;
entry->ptr = object;
_
Patches currently in -mm which might be from andreyknvl@xxxxxxxxxx are
kasan-stop-leaking-stack-trace-handles.patch
