Skip to content

Commit a3616a3

Browse files
committed
signal/m68k: Use force_sigsegv(SIGSEGV) in fpsp040_die
In the fpsp040 code when copyin or copyout fails call force_sigsegv(SIGSEGV) instead of do_exit(SIGSEGV). This solves a couple of problems. Because do_exit embeds the ptrace stop PTRACE_EVENT_EXIT a complete stack frame needs to be present for that to work correctly. There is always the information needed for a ptrace stop where get_signal is called. So exiting with a signal solves the ptrace issue. Further exiting with a signal ensures that all of the threads in a process are killed not just the thread that malfunctioned. Which avoids confusing userspace. To make force_sigsegv(SIGSEGV) work in fpsp040_die modify the code to save all of the registers and jump to ret_from_exception (which ultimately calls get_signal) after fpsp040_die returns. v2: Updated the branches to use gas's pseudo ops that automatically calculate the best branch instruction to use for the purpose. v1: https://lkml.kernel.org/r/87a6m8kgtx.fsf_-_@disp2133 Link: https://lkml.kernel.org/r/87tukghjfs.fsf_-_@disp2133 Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
1 parent b48c723 commit a3616a3

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

arch/m68k/fpsp040/skeleton.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,8 @@ in_ea:
502502
.section .fixup,#alloc,#execinstr
503503
.even
504504
1:
505-
jbra fpsp040_die
505+
jbsr fpsp040_die
506+
jbra .Lnotkern
506507

507508
.section __ex_table,#alloc
508509
.align 4

arch/m68k/kernel/traps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,7 @@ asmlinkage void set_esp0(unsigned long ssp)
11501150
*/
11511151
asmlinkage void fpsp040_die(void)
11521152
{
1153-
do_exit(SIGSEGV);
1153+
force_sigsegv(SIGSEGV);
11541154
}
11551155

11561156
#ifdef CONFIG_M68KFPU_EMU

0 commit comments

Comments
 (0)