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

Commit 51c0dca5 authored by Michael Schmitz's avatar Michael Schmitz Committed by Greg Kroah-Hartman
Browse files

m68k: Check syscall_trace_enter() return code 



[ Upstream commit 2ca8a1de4437f21562e57f9ac123914747a8e7a1 ]

Check return code of syscall_trace_enter(), and skip syscall
if -1. Return code will be left at what had been set by
ptrace or seccomp (in regs->d0).

No regression seen in testing with strace on ARAnyM.

Signed-off-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20230112035529.13521-2-schmitzmic@gmail.com


Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 87363d1a

arch/m68k/68000/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ do_trace: 
	jbsr	syscall_trace_enter

	RESTORE_SWITCH_STACK

	addql	#4,%sp

	addql	#1,%d0

	jeq	ret_from_exception

	movel	%sp@(PT_OFF_ORIG_D0),%d1

	movel	#-ENOSYS,%d0

	cmpl	#NR_syscalls,%d1

arch/m68k/coldfire/entry.S

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ ENTRY(system_call) 
	jbsr	syscall_trace_enter

	RESTORE_SWITCH_STACK

	addql	#4,%sp

	addql	#1,%d0

	jeq	ret_from_exception

	movel	%d3,%a0

	jbsr	%a0@

	movel	%d0,%sp@(PT_OFF_D0)		/* save the return value */

arch/m68k/kernel/entry.S

+3 −0
Original line number Diff line number Diff line
@@ -160,9 +160,12 @@ do_trace_entry: 
	jbsr	syscall_trace

	RESTORE_SWITCH_STACK

	addql	#4,%sp

	addql	#1,%d0			| optimization for cmpil #-1,%d0

	jeq	ret_from_syscall

	movel	%sp@(PT_OFF_ORIG_D0),%d0

	cmpl	#NR_syscalls,%d0

	jcs	syscall

	jra	ret_from_syscall

badsys:

	movel	#-ENOSYS,%sp@(PT_OFF_D0)

	jra	ret_from_syscall