Skip to contentSkip to conversation

kasan-memset-free-track-in-qlink_free.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Dec 29, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: kasan: memset free track in qlink_free
has been removed from the -mm tree. Its filename was
kasan-memset-free-track-in-qlink_free.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 <[email protected]>
Subject: kasan: memset free track in qlink_free
Date: Tue, 19 Dec 2023 22:19:52 +0100

Instead of only zeroing out the stack depot handle when evicting the free stack trace in qlink_free, zero out the whole track.

Do this just to produce a similar effect for alloc and free meta. The other fields of the free track besides the stack trace handle are considered invalid at this point anyway, so no harm in zeroing them out.

Fixes 773688a6cb24 ("kasan: use stack_depot_put for Generic mode")
Cc Alexander Potapenko <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Evgenii Stepanov <[email protected]>
Cc Tetsuo Handa <[email protected]>
Cc Vlastimil Babka <[email protected]>

---

 mm/kasan/quarantine.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/kasan/quarantine.c renamed from mm/kasan/quarantine.c~kasan-memset-free-track-in-qlink_free +1 -1
@@ -157,7 +157,7 @@ static void qlink_free(struct qlist_node
 	if (free_meta &&
 	    *(u8 *)kasan_mem_to_shadow(object) == KASAN_SLAB_FREETRACK) {
 		stack_depot_put(free_meta->free_track.stack);
-		free_meta->free_track.stack = 0;
+		__memset(&free_meta->free_track, 0, sizeof(free_meta->free_track));
 	}
 
 	/*

_

Patches currently in -mm which might be from [email protected] are

kasan-stop-leaking-stack-trace-handles.patch