Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2354a750 authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman
Browse files

m68k: Update ->thread.esp0 before calling syscall_trace() in ret_from_signal



commit 50e43a57334400668952f8e551c9d87d3ed2dfef upstream.

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Fixes: bd6f56a7 ("m68k: Missing syscall_trace() on sigreturn")
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Reviewed-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Tested-by: default avatarFinn Thain <fthain@linux-m68k.org>
Link: https://lore.kernel.org/r/YP2dMWeV1LkHiOpr@zeniv-ca.linux.org.uk


Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarFinn Thain <fthain@linux-m68k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2b0bd505
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -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