Skip to contentSkip to conversation

mm-kasan-use-kasan_tag_kernel-instead-of-0xff.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: mm, kasan: use KASAN_TAG_KERNEL instead of 0xff
has been removed from the -mm tree.  Its filename was
     mm-kasan-use-kasan_tag_kernel-instead-of-0xff.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: mm, kasan: use KASAN_TAG_KERNEL instead of 0xff
Date: Thu, 21 Dec 2023 21:04:44 +0100

Use the KASAN_TAG_KERNEL marco instead of open-coding 0xff in the mm code. This macro is provided by include/linux/kasan-tags.h, which does not include any other headers, so it's safe to include it into mm.h without causing circular include dependencies.

---

 include/linux/kasan.h |    1 +
 include/linux/mm.h    |    4 ++--
 mm/page_alloc.c       |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
include/linux/kasan.h renamed from include/linux/kasan.h~mm-kasan-use-kasan_tag_kernel-instead-of-0xff +1 -0
@@ -4,6 +4,7 @@
 
 #include <linux/bug.h>
 #include <linux/kasan-enabled.h>
+#include <linux/kasan-tags.h>
 #include <linux/kernel.h>
 #include <linux/static_key.h>
 #include <linux/types.h>
include/linux/mm.h renamed from include/linux/mm.h~mm-kasan-use-kasan_tag_kernel-instead-of-0xff +2 -2
@@ -1815,7 +1815,7 @@ static inline void vma_set_access_pid_bi
 
 static inline u8 page_kasan_tag(const struct page *page)
 {
-	u8 tag = 0xff;
+	u8 tag = KASAN_TAG_KERNEL;
 
 	if (kasan_enabled()) {
 		tag = (page->flags >> KASAN_TAG_PGSHIFT) & KASAN_TAG_MASK;
@@ -1844,7 +1844,7 @@ static inline void page_kasan_tag_set(st
 static inline void page_kasan_tag_reset(struct page *page)
 {
 	if (kasan_enabled())
-		page_kasan_tag_set(page, 0xff);
+		page_kasan_tag_set(page, KASAN_TAG_KERNEL);
 }
 
 #else /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */
mm/page_alloc.c renamed from mm/page_alloc.c~mm-kasan-use-kasan_tag_kernel-instead-of-0xff +1 -1
@@ -1059,7 +1059,7 @@ static inline bool should_skip_kasan_poi
 	if (IS_ENABLED(CONFIG_KASAN_GENERIC))
 		return deferred_pages_enabled();
 
-	return page_kasan_tag(page) == 0xff;
+	return page_kasan_tag(page) == KASAN_TAG_KERNEL;
 }
 
 static void kernel_init_pages(struct page *page, int numpages)

_

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

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