kasan-move-kasan_get_alloc-free_track-definitions.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Oct 3, 2022

Share & tools

Andrew Morton

author tree notice Applied

2022-10-03 21:09 UTC #0 lore raw

The quilt patch titled
Subject: kasan: move kasan_get_alloc/free_track definitions
has been removed from the -mm tree. Its filename was
kasan-move-kasan_get_alloc-free_track-definitions.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: move kasan_get_alloc/free_track definitions
Date: Mon, 5 Sep 2022 23:05:35 +0200

Move the definitions of kasan_get_alloc/free_track() to report_*.c, as they belong with other the reporting code.

Link https://lkml.kernel.org/r/0cb15423956889b3905a0174b58782633bbbd72e.1662411799.git.andreyknvl@google.com open here

Signed-off-by Andrey Konovalov <[email protected]>

Reviewed-by Marco Elver <[email protected]>

Cc Alexander Potapenko <[email protected]>

Cc Andrey Ryabinin <[email protected]>

Cc Dmitry Vyukov <[email protected]>

Cc Evgenii Stepanov <[email protected]>

Cc Peter Collingbourne <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 mm/kasan/generic.c        |   21 ---------------------
 mm/kasan/report_generic.c |   21 +++++++++++++++++++++
 mm/kasan/report_tags.c    |   12 ++++++++++++
 mm/kasan/tags.c           |   12 ------------
 4 files changed, 33 insertions(+), 33 deletions(-)

mm/kasan/generic.c renamed from mm/kasan/generic.c~kasan-move-kasan_get_alloc-free_track-definitions +0 ~~-21~~

@@ -512,24 +512,3 @@ void kasan_save_free_info(struct kmem_ca
 	/* The object was freed and has free track set. */
 	*(u8 *)kasan_mem_to_shadow(object) = KASAN_SLAB_FREETRACK;
 }
-
-struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache,
-						void *object)
-{
-	struct kasan_alloc_meta *alloc_meta;
-
-	alloc_meta = kasan_get_alloc_meta(cache, object);
-	if (!alloc_meta)
-		return NULL;
-
-	return &alloc_meta->alloc_track;
-}
-
-struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,
-						void *object, u8 tag)
-{
-	if (*(u8 *)kasan_mem_to_shadow(object) != KASAN_SLAB_FREETRACK)
-		return NULL;
-	/* Free meta must be present with KASAN_SLAB_FREETRACK. */
-	return &kasan_get_free_meta(cache, object)->free_track;
-}

mm/kasan/report_generic.c renamed from mm/kasan/report_generic.c~kasan-move-kasan_get_alloc-free_track-definitions +21 -0

@@ -127,6 +127,27 @@ const char *kasan_get_bug_type(struct ka
 	return get_wild_bug_type(info);
 }
 
+struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache,
+						void *object)
+{
+	struct kasan_alloc_meta *alloc_meta;
+
+	alloc_meta = kasan_get_alloc_meta(cache, object);
+	if (!alloc_meta)
+		return NULL;
+
+	return &alloc_meta->alloc_track;
+}
+
+struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,
+						void *object, u8 tag)
+{
+	if (*(u8 *)kasan_mem_to_shadow(object) != KASAN_SLAB_FREETRACK)
+		return NULL;
+	/* Free meta must be present with KASAN_SLAB_FREETRACK. */
+	return &kasan_get_free_meta(cache, object)->free_track;
+}
+
 void kasan_metadata_fetch_row(char *buffer, void *row)
 {
 	memcpy(buffer, kasan_mem_to_shadow(row), META_BYTES_PER_ROW);

mm/kasan/report_tags.c renamed from mm/kasan/report_tags.c~kasan-move-kasan_get_alloc-free_track-definitions +12 -0

@@ -21,3 +21,15 @@ const char *kasan_get_bug_type(struct ka
 
 	return "invalid-access";
 }
+
+struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache,
+						void *object)
+{
+	return NULL;
+}
+
+struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,
+						void *object, u8 tag)
+{
+	return NULL;
+}

mm/kasan/tags.c renamed from mm/kasan/tags.c~kasan-move-kasan_get_alloc-free_track-definitions +0 ~~-12~~

@@ -24,15 +24,3 @@ void kasan_save_alloc_info(struct kmem_c
 void kasan_save_free_info(struct kmem_cache *cache, void *object)
 {
 }
-
-struct kasan_track *kasan_get_alloc_track(struct kmem_cache *cache,
-						void *object)
-{
-	return NULL;
-}
-
-struct kasan_track *kasan_get_free_track(struct kmem_cache *cache,
-						void *object, u8 tag)
-{
-	return NULL;
-}

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

kasan-fix-array-bounds-warnings-in-tests.patch