powerpc/mm/fault: Use str_write_read() helper function
authorThorsten Blum <thorsten.blum@linux.dev>
Mon, 10 Feb 2025 10:06:46 +0000 (11:06 +0100)
committerMadhavan Srinivasan <maddy@linux.ibm.com>
Thu, 15 May 2025 04:30:28 +0000 (10:00 +0530)
Remove hard-coded strings by using the str_write_read() helper function.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/20250210100648.1440-2-thorsten.blum@linux.dev
arch/powerpc/mm/fault.c

index c156fe0d53c3786a24a46e62d9a9e45c49b5896b..806c74e0d5ab706850ee4bb2a8cc0dadaa5ee127 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/string_choices.h>
 #include <linux/types.h>
 #include <linux/pagemap.h>
 #include <linux/ptrace.h>
@@ -218,7 +219,7 @@ static bool bad_kernel_fault(struct pt_regs *regs, unsigned long error_code,
        // Read/write fault blocked by KUAP is bad, it can never succeed.
        if (bad_kuap_fault(regs, address, is_write)) {
                pr_crit_ratelimited("Kernel attempted to %s user page (%lx) - exploit attempt? (uid: %d)\n",
-                                   is_write ? "write" : "read", address,
+                                   str_write_read(is_write), address,
                                    from_kuid(&init_user_ns, current_uid()));
 
                // Fault on user outside of certain regions (eg. copy_tofrom_user()) is bad
@@ -625,7 +626,7 @@ static void __bad_page_fault(struct pt_regs *regs, int sig)
        case INTERRUPT_DATA_STORAGE:
        case INTERRUPT_H_DATA_STORAGE:
                pr_alert("BUG: %s on %s at 0x%08lx\n", msg,
-                        is_write ? "write" : "read", regs->dar);
+                        str_write_read(is_write), regs->dar);
                break;
        case INTERRUPT_DATA_SEGMENT:
                pr_alert("BUG: %s at 0x%08lx\n", msg, regs->dar);