Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

m68k: Only force 030 bus error if PC not in exception table

__get_kernel_nofault() does copy data in supervisor mode when
forcing a task backtrace log through /proc/sysrq_trigger.
This is expected cause a bus error exception on e.g. NULL
pointer dereferencing when logging a kernel task has no
workqueue associated. This bus error ought to be ignored.

Our 030 bus error handler is ill equipped to deal with this:

Whenever ssw indicates a kernel mode access on a data fault,
we don't even attempt to handle the fault and instead always
send a SEGV signal (or panic). As a result, the check
for exception handling at the fault PC (buried in
send_sig_fault() which gets called from do_page_fault()
eventually) is never used.

In contrast, both 040 and 060 access error handlers do not
care whether a fault happened on supervisor mode access,
and will call do_page_fault() on those, ultimately honoring
the exception table.

Add a check in bus_error030 to call do_page_fault() in case
we do have an entry for the fault PC in our exception table.

I had attempted a fix for this earlier in 2019 that did rely
on testing pagefault_disabled() (see link below) to achieve
the same thing, but this patch should be more generic.

Tested on 030 Atari Falcon.

Reported-by: Eero Tamminen <oak@helsinkinet.fi>
Link: https://lore.kernel.org/r/alpine.LNX.2.21.1904091023540.25@nippy.intranet
Link: https://lore.kernel.org/r/63130691-1984-c423-c1f2-73bfd8d3dcd3@gmail.com
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20230301021107.26307-1-schmitzmic@gmail.com
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

authored by

Michael Schmitz and committed by
Geert Uytterhoeven
e36a82be d4b97925

+3 -1
+3 -1
arch/m68k/kernel/traps.c
··· 30 30 #include <linux/init.h> 31 31 #include <linux/ptrace.h> 32 32 #include <linux/kallsyms.h> 33 + #include <linux/extable.h> 33 34 34 35 #include <asm/setup.h> 35 36 #include <asm/fpu.h> ··· 546 545 errorcode |= 2; 547 546 548 547 if (mmusr & (MMU_I | MMU_WP)) { 549 - if (ssw & 4) { 548 + /* We might have an exception table for this PC */ 549 + if (ssw & 4 && !search_exception_tables(fp->ptregs.pc)) { 550 550 pr_err("Data %s fault at %#010lx in %s (pc=%#lx)\n", 551 551 ssw & RW ? "read" : "write", 552 552 fp->un.fmtb.daddr,