kasan-use-kasan_addr_to_slab-in-print_address_description.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: use kasan_addr_to_slab in print_address_description
has been removed from the -mm tree. Its filename was
kasan-use-kasan_addr_to_slab-in-print_address_description.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: use kasan_addr_to_slab in print_address_description
Date: Mon, 5 Sep 2022 23:05:38 +0200

Use the kasan_addr_to_slab() helper in print_address_description() instead of separately invoking PageSlab() and page_slab().

Link https://lkml.kernel.org/r/8b744fbf8c3c7fc5d34329ec70b60ee5c8dba66c.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/common.c |    7 +++++++
 mm/kasan/report.c |   11 ++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

mm/kasan/common.c renamed from mm/kasan/common.c~kasan-use-kasan_addr_to_slab-in-print_address_description +7 -0

@@ -30,6 +30,13 @@
 #include "kasan.h"
 #include "../slab.h"
 
+struct slab *kasan_addr_to_slab(const void *addr)
+{
+	if (virt_addr_valid(addr))
+		return virt_to_slab(addr);
+	return NULL;
+}
+
 depot_stack_handle_t kasan_save_stack(gfp_t flags, bool can_alloc)
 {
 	unsigned long entries[KASAN_STACK_DEPTH];

mm/kasan/report.c renamed from mm/kasan/report.c~kasan-use-kasan_addr_to_slab-in-print_address_description +2 -9

@@ -213,13 +213,6 @@ struct page *kasan_addr_to_page(const vo
 	return NULL;
 }
 
-struct slab *kasan_addr_to_slab(const void *addr)
-{
-	if (virt_addr_valid(addr))
-		return virt_to_slab(addr);
-	return NULL;
-}
-
 static void describe_object_addr(struct kmem_cache *cache, void *object,
 				const void *addr)
 {

@@ -297,12 +290,12 @@ static inline bool init_task_stack_addr(
 static void print_address_description(void *addr, u8 tag)
 {
 	struct page *page = kasan_addr_to_page(addr);
+	struct slab *slab = kasan_addr_to_slab(addr);
 
 	dump_stack_lvl(KERN_ERR);
 	pr_err("\n");
 
-	if (page && PageSlab(page)) {
-		struct slab *slab = page_slab(page);
+	if (slab) {
 		struct kmem_cache *cache = slab->slab_cache;
 		void *object = nearest_obj(cache, slab,	addr);

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

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