Commit c862fe70 authored by Michael Schmitz's avatar Michael Schmitz Committed by Geert Uytterhoeven
Browse files

m68k: Wire up syscall_trace_enter/leave for m68k 



m68k (other than Coldfire) uses syscall_trace for both trace entry
and trace exit. Seccomp support requires separate entry points for
trace entry and exit which are already provided for Coldfire.

Replace syscall_trace by syscall_trace_enter and syscall_trace_leave
in preparation for seccomp support.

No regression seen in testing with strace on ARAnyM.

Signed-off-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Acked-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Link: https://lore.kernel.org/r/20220127074158.25888-2-schmitzmic@gmail.com


Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent a96e4ebf

arch/m68k/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ do_trace_entry: 
	movel	#-ENOSYS,%sp@(PT_OFF_D0)| needed for strace

	subql	#4,%sp

	SAVE_SWITCH_STACK

	jbsr	syscall_trace

	jbsr	syscall_trace_enter

	RESTORE_SWITCH_STACK

	addql	#4,%sp

	movel	%sp@(PT_OFF_ORIG_D0),%d0
@@ -194,7 +194,7 @@ badsys: 
do_trace_exit:

	subql	#4,%sp

	SAVE_SWITCH_STACK

	jbsr	syscall_trace

	jbsr	syscall_trace_leave

	RESTORE_SWITCH_STACK

	addql	#4,%sp

	jra	.Lret_from_exception

arch/m68k/kernel/ptrace.c

+0 −7
Original line number Diff line number Diff line
@@ -270,12 +270,6 @@ long arch_ptrace(struct task_struct *child, long request, 
	return -EIO;

}



asmlinkage void syscall_trace(void)

{

	ptrace_report_syscall(0);

}



#if defined(CONFIG_COLDFIRE) || !defined(CONFIG_MMU)

asmlinkage int syscall_trace_enter(void)

{

	int ret = 0;
@@ -290,4 +284,3 @@ asmlinkage void syscall_trace_leave(void) 
	if (test_thread_flag(TIF_SYSCALL_TRACE))

		ptrace_report_syscall_exit(task_pt_regs(current), 0);

}
 
#endif /* CONFIG_COLDFIRE */