Skip to contentSkip to conversation

mm-kfence-use-str_write_read-helper-in-get_access_type.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jan 20, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/kfence: use str_write_read() helper in get_access_type()
has been removed from the -mm tree. Its filename was
mm-kfence-use-str_write_read-helper-in-get_access_type.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: Thorsten Blum <[email protected]>
Subject: mm/kfence: use str_write_read() helper in get_access_type()
Date: Wed, 15 Jan 2025 16:55:12 +0100

Remove hard-coded strings by using the str_write_read() helper function.

---

 mm/kfence/kfence_test.c |    3 ++-
 mm/kfence/report.c      |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
mm/kfence/kfence_test.c renamed from mm/kfence/kfence_test.c~mm-kfence-use-str_write_read-helper-in-get_access_type +2 -1
@@ -20,6 +20,7 @@
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/string.h>
+#include <linux/string_choices.h>
 #include <linux/tracepoint.h>
 #include <trace/events/printk.h>
 
@@ -88,7 +89,7 @@ struct expect_report {
 
 static const char *get_access_type(const struct expect_report *r)
 {
-	return r->is_write ? "write" : "read";
+	return str_write_read(r->is_write);
 }
 
 /* Check observed report matches information in @r. */
mm/kfence/report.c renamed from mm/kfence/report.c~mm-kfence-use-str_write_read-helper-in-get_access_type +2 -1
@@ -16,6 +16,7 @@
 #include <linux/sprintf.h>
 #include <linux/stacktrace.h>
 #include <linux/string.h>
+#include <linux/string_choices.h>
 #include <linux/sched/clock.h>
 #include <trace/events/error_report.h>
 
@@ -184,7 +185,7 @@ static void print_diff_canary(unsigned l
 
 static const char *get_access_type(bool is_write)
 {
-	return is_write ? "write" : "read";
+	return str_write_read(is_write);
 }
 
 void kfence_report_error(unsigned long address, bool is_write, struct pt_regs *regs,

_

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

ocfs2-use-str_yes_no-and-str_no_yes-helper-functions.patch