m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal
PATCH 1/1 m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal
From: Al Viro <[email protected]>
[ Upstream commit 50e43a57334400668952f8e551c9d87d3ed2dfef ]
We get there when sigreturn has performed obscene acts on kernel stack; in particular, the location of pt_regs has shifted. We are about to call syscall_trace(), which might stop for tracer. If that happens, we'd better have task_pt_regs() returning correct result...
Fucked-up-by Al Viro <[email protected]>
Fixes bd6f56a75bb2 ("m68k: Missing syscall_trace() on sigreturn")
Signed-off-by Al Viro <[email protected]>
Tested-by Michael Schmitz <[email protected]>
Reviewed-by Michael Schmitz <[email protected]>
Tested-by Finn Thain <[email protected]>
Signed-off-by Geert Uytterhoeven <[email protected]>
Signed-off-by Finn Thain <[email protected]>
--- arch/m68k/kernel/entry.S | 2 ++ 1 file changed, 2 insertions(+)
arch/m68k/kernel/entry.S +2 -0
@@ -182,6 +182,8 @@ ENTRY(ret_from_signal) movel %curptr@(TASK_STACK),%a1 tstb %a1@(TINFO_FLAGS+2) jge 1f + lea %sp@(SWITCH_STACK_SIZE),%a1 + movel %a1,%curptr@(TASK_THREAD+THREAD_ESP0) jbsr syscall_trace 1: RESTORE_SWITCH_STACK addql #4,%sp