summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@libc.org>2018-03-15 20:01:36 -0400
committerRich Felker <dalias@libc.org>2018-04-12 19:47:52 -0400
commit96a598996f6ac518ac79839ecbb17c91af91f4f7 (patch)
treee98fa02d3b025abe1a3bd55d804a64e4259bcdf5
parenteb6b6930a70faefe04479a71088cc10366782d9a (diff)
downloadlinux-sh-96a598996f6ac518ac79839ecbb17c91af91f4f7.tar.gz
sh: fix debug trap failure to process signals before return to user
When responding to a debug trap (breakpoint) in userspace, the kernel's trap handler raised SIGTRAP but returned from the trap via a code path that ignored pending signals, resulting in an infinite loop re-executing the trapping instruction. Signed-off-by: Rich Felker <dalias@libc.org>
-rw-r--r--arch/sh/kernel/entry-common.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/entry-common.S b/arch/sh/kernel/entry-common.S
index c001f782c5f1..28cc61216b64 100644
--- a/arch/sh/kernel/entry-common.S
+++ b/arch/sh/kernel/entry-common.S
@@ -255,7 +255,7 @@ debug_trap:
mov.l @r8, r8
jsr @r8
nop
- bra __restore_all
+ bra ret_from_exception
nop
CFI_ENDPROC