Skip to contentSkip to conversation

kasan-make-kasan_addr_to_page-static.patch removed from -mm tree

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

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: kasan: make kasan_addr_to_page static
has been removed from the -mm tree. Its filename was
kasan-make-kasan_addr_to_page-static.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: make kasan_addr_to_page static
Date: Mon, 5 Sep 2022 23:05:39 +0200

As kasan_addr_to_page() is only used in report.c, rename it to addr_to_page() and make it static.

---

 mm/kasan/kasan.h  |    1 -
 mm/kasan/report.c |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
mm/kasan/kasan.h renamed from mm/kasan/kasan.h~kasan-make-kasan_addr_to_page-static +0 -1
@@ -291,7 +291,6 @@ bool kasan_report(unsigned long addr, si
 		bool is_write, unsigned long ip);
 void kasan_report_invalid_free(void *object, unsigned long ip, enum kasan_report_type type);
 
-struct page *kasan_addr_to_page(const void *addr);
 struct slab *kasan_addr_to_slab(const void *addr);
 
 #ifdef CONFIG_KASAN_GENERIC
mm/kasan/report.c renamed from mm/kasan/report.c~kasan-make-kasan_addr_to_page-static +2 -2
@@ -206,7 +206,7 @@ static void print_track(struct kasan_tra
 		pr_err("(stack is not available)\n");
 }
 
-struct page *kasan_addr_to_page(const void *addr)
+static inline struct page *addr_to_page(const void *addr)
 {
 	if (virt_addr_valid(addr))
 		return virt_to_head_page(addr);
@@ -289,7 +289,7 @@ 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 page *page = addr_to_page(addr);
 	struct slab *slab = kasan_addr_to_slab(addr);
 
 	dump_stack_lvl(KERN_ERR);

_

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

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