Commit 42da6b7e authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

ptrace/arm: Rename tracehook_report_syscall report_syscall 



Make the arm and arm64 code more concise and less confusing by
renaming the architecture specific tracehook_report_syscall to
report_syscall.

Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20220309162454.123006-2-ebiederm@xmission.com


Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent 19397e8b

arch/arm/kernel/ptrace.c

+3 −4
Original line number Diff line number Diff line
@@ -831,8 +831,7 @@ enum ptrace_syscall_dir { 
	PTRACE_SYSCALL_EXIT,

};



static void tracehook_report_syscall(struct pt_regs *regs,

				    enum ptrace_syscall_dir dir)

static void report_syscall(struct pt_regs *regs, enum ptrace_syscall_dir dir)

{

	unsigned long ip;
@@ -856,7 +855,7 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs) 
	int scno;



	if (test_thread_flag(TIF_SYSCALL_TRACE))

		tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);

		report_syscall(regs, PTRACE_SYSCALL_ENTER);



	/* Do seccomp after ptrace; syscall may have changed. */

#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
@@ -897,5 +896,5 @@ asmlinkage void syscall_trace_exit(struct pt_regs *regs) 
		trace_sys_exit(regs, regs_return_value(regs));



	if (test_thread_flag(TIF_SYSCALL_TRACE))

		tracehook_report_syscall(regs, PTRACE_SYSCALL_EXIT);

		report_syscall(regs, PTRACE_SYSCALL_EXIT);

}

arch/arm64/kernel/ptrace.c

+3 −4
Original line number Diff line number Diff line
@@ -1792,8 +1792,7 @@ enum ptrace_syscall_dir { 
	PTRACE_SYSCALL_EXIT,

};



static void tracehook_report_syscall(struct pt_regs *regs,

				     enum ptrace_syscall_dir dir)

static void report_syscall(struct pt_regs *regs, enum ptrace_syscall_dir dir)

{

	int regno;

	unsigned long saved_reg;
@@ -1842,7 +1841,7 @@ int syscall_trace_enter(struct pt_regs *regs) 
	unsigned long flags = read_thread_flags();



	if (flags & (_TIF_SYSCALL_EMU | _TIF_SYSCALL_TRACE)) {

		tracehook_report_syscall(regs, PTRACE_SYSCALL_ENTER);

		report_syscall(regs, PTRACE_SYSCALL_ENTER);

		if (flags & _TIF_SYSCALL_EMU)

			return NO_SYSCALL;

	}
@@ -1870,7 +1869,7 @@ void syscall_trace_exit(struct pt_regs *regs) 
		trace_sys_exit(regs, syscall_get_return_value(current, regs));



	if (flags & (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP))

		tracehook_report_syscall(regs, PTRACE_SYSCALL_EXIT);

		report_syscall(regs, PTRACE_SYSCALL_EXIT);



	rseq_syscall(regs);

}