m68k: kernel/traps.c - only force 030 bus error if PC not in exception table
PATCH v2 1/1 m68k: kernel/traps.c - 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.
--
Changes from v1:
- add comment
- reword commit message
- add link to old patch as well (stick to lore.kernel.org even though these links are currently not functional)
--- arch/m68k/kernel/traps.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/m68k/kernel/traps.c +3 -1
@@ -30,6 +30,7 @@#include <linux/init.h> #include <linux/ptrace.h> #include <linux/kallsyms.h> +#include <linux/extable.h> #include <asm/setup.h> #include <asm/fpu.h>
@@ -545,7 +546,8 @@ static inline void bus_error030 (struct frame *fp) errorcode |=2 ;if (mmusr & (MMU_I |MMU_WP )) { -if (ssw &4 ) { +/* We might have an exception table for this PC */ +if (ssw &4 && !search_exception_tables (fp->ptregs.pc)) { pr_err("Data %s fault at %#010lx in %s (pc=%#lx)\n", ssw & RW ? "read" : "write", fp->un.fmtb.daddr,
Signature · 1 line
2.17.1
Quoted 37 lines · Michael Schmitz
__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 fromdo_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_error030to calldo_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.
Signed-off-by Michael Schmitz <[email protected]>Reported-by Eero Tamminen <[email protected]>CC Eero Tamminen <[email protected]>CC Finn Thain <[email protected]>CC Andreas Schwab <[email protected]>CC Geert Uytterhoeven <[email protected]>
Quoted 8 lines
--
Changes from v1:
- add comment
- reword commit message
- add link to old patch as well (stick to lore.kernel.org even though these links are currently not functional)
i.e. will queue as a fix in the m68k for-v6.3 branch.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Geert,
Quoted 40 lines · Geert Uytterhoeven
Quoted 39 lines · Michael Schmitz
__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 fromdo_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_error030to calldo_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.
Signed-off-by Michael Schmitz <[email protected]>Reported-by Eero Tamminen <[email protected]>CC Eero Tamminen <[email protected]>CC Finn Thain <[email protected]>CC Andreas Schwab <[email protected]>CC Geert Uytterhoeven <[email protected]>--
Quoted 8 lines
Quoted 6 lines
Changes from v1:
- add comment
- reword commit message
- add link to old patch as well (stick to lore.kernel.org even though these links are currently not functional)Reviewed-by Geert Uytterhoeven <[email protected]>i.e. will queue as a fix in the m68k for-v6.3 branch.
Thanks - I neglected to search far enough back to find where the context of this diff originates, but upon a closer look, it appears to be the well-known commit 1da177e4c3f4 (start of git history). Do you think this is worth a backport to stable?
Cheers,
Michael
Quoted 4 lines
Gr{oetje,eeting}s,
Geert
Geert Uytterhoeven
maintainerHi Michael,
Quoted 47 lines · Michael Schmitz
Quoted 46 lines · Geert Uytterhoeven
Quoted 45 lines · Michael Schmitz
__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 fromdo_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_error030to calldo_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.
Signed-off-by Michael Schmitz <[email protected]>Reported-by Eero Tamminen <[email protected]>CC Eero Tamminen <[email protected]>CC Finn Thain <[email protected]>CC Andreas Schwab <[email protected]>CC Geert Uytterhoeven <[email protected]>--
Changes from v1:
- add comment
- reword commit message
- add link to old patch as well (stick to lore.kernel.org even though these links are currently not functional)
Quoted 7 lines
Quoted 2 lines
Reviewed-by Geert Uytterhoeven <[email protected]>i.e. will queue as a fix in the m68k for-v6.3 branch.
Thanks - I neglected to search far enough back to find where the context of this diff originates, but upon a closer look, it appears to be the well-known commit
1da177e4c3f4(start of git history). Do you think this is worth a backport to stable?
I guess it will be auto-backported to stable once it has reached upstream, together with the two other fixes.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Geert,
Quoted 50 lines · Geert Uytterhoeven
Hi Michael,
Quoted 47 lines · Michael Schmitz
Quoted 46 lines · Geert Uytterhoeven
Quoted 45 lines · Michael Schmitz
__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 fromdo_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_error030to calldo_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.
Signed-off-by Michael Schmitz <[email protected]>Reported-by Eero Tamminen <[email protected]>CC Eero Tamminen <[email protected]>CC Finn Thain <[email protected]>CC Andreas Schwab <[email protected]>CC Geert Uytterhoeven <[email protected]>--
Changes from v1:
- add comment
- reword commit message
- add link to old patch as well (stick to lore.kernel.org even though these links are currently not functional)
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Reviewed-by Geert Uytterhoeven <[email protected]>i.e. will queue as a fix in the m68k for-v6.3 branch.
Thanks - I neglected to search far enough back to find where the context of this diff originates, but upon a closer look, it appears to be the well-known commit
1da177e4c3f4(start of git history). Do you think this is worth a backport to stable?I guess it will be auto-backported to stable once it has reached upstream, together with the two other fixes.
Fair enough - I'll check in a month or so and remind the stable maintainers if need be.
Cheers,
Michael
Quoted 5 lines
Gr{oetje,eeting}s,
Geert