| Message ID | 20250210100648.1440-2-thorsten.blum@linux.dev (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ff27a9a0c66cfeb6a15d8f2ab4754f312ecd71e7 |
| Headers | show |
| Series | powerpc/mm/fault: Use str_write_read() helper function | expand |
Le 10/02/2025 à 11:06, Thorsten Blum a écrit : > 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> Not sure you saw it, there's also one in: linus/master:arch/powerpc/platforms/ps3/device-init.c:727: const char *op = write ? "write" : "read"; > --- > arch/powerpc/mm/fault.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c > index c156fe0d53c3..806c74e0d5ab 100644 > --- a/arch/powerpc/mm/fault.c > +++ b/arch/powerpc/mm/fault.c > @@ -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);
On Mon, 10 Feb 2025 11:06:46 +0100, Thorsten Blum wrote: > Remove hard-coded strings by using the str_write_read() helper function. > > Applied to powerpc/next. [1/1] powerpc/mm/fault: Use str_write_read() helper function https://git.kernel.org/powerpc/c/ff27a9a0c66cfeb6a15d8f2ab4754f312ecd71e7 Thanks
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index c156fe0d53c3..806c74e0d5ab 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -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);
Remove hard-coded strings by using the str_write_read() helper function. Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev> --- arch/powerpc/mm/fault.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)