Commit 153474ba authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

ptrace: Create ptrace_report_syscall_{entry,exit} in ptrace.h 



Rename tracehook_report_syscall_{entry,exit} to
ptrace_report_syscall_{entry,exit} and place them in ptrace.h

There is no longer any generic tracehook infractructure so make
these ptrace specific functions ptrace specific.

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


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

arch/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ config TRACE_IRQFLAGS_SUPPORT 
#	asm/syscall.h		supplying asm-generic/syscall.h interface

#	linux/regset.h		user_regset interfaces

#	CORE_DUMP_USE_REGSET	#define'd in linux/elf.h

#	TIF_SYSCALL_TRACE	calls tracehook_report_syscall_{entry,exit}

#	TIF_SYSCALL_TRACE	calls ptrace_report_syscall_{entry,exit}

#	TIF_NOTIFY_RESUME	calls tracehook_notify_resume()

#	signal delivery		calls tracehook_signal_handler()

#

arch/alpha/kernel/ptrace.c

+2 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/user.h>

#include <linux/security.h>

#include <linux/signal.h>

#include <linux/tracehook.h>

#include <linux/audit.h>



#include <linux/uaccess.h>
@@ -323,7 +322,7 @@ asmlinkage unsigned long syscall_trace_enter(void) 
	unsigned long ret = 0;

	struct pt_regs *regs = current_pt_regs();

	if (test_thread_flag(TIF_SYSCALL_TRACE) &&

	    tracehook_report_syscall_entry(current_pt_regs()))

	    ptrace_report_syscall_entry(current_pt_regs()))

		ret = -1UL;

	audit_syscall_entry(regs->r0, regs->r16, regs->r17, regs->r18, regs->r19);

	return ret ?: current_pt_regs()->r0;
@@ -334,5 +333,5 @@ syscall_trace_leave(void) 
{

	audit_syscall_exit(current_pt_regs());

	if (test_thread_flag(TIF_SYSCALL_TRACE))

		tracehook_report_syscall_exit(current_pt_regs(), 0);

		ptrace_report_syscall_exit(current_pt_regs(), 0);

}

arch/arc/kernel/ptrace.c

+2 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
 */



#include <linux/ptrace.h>

#include <linux/tracehook.h>

#include <linux/sched/task_stack.h>

#include <linux/regset.h>

#include <linux/unistd.h>
@@ -258,7 +257,7 @@ long arch_ptrace(struct task_struct *child, long request, 


asmlinkage int syscall_trace_entry(struct pt_regs *regs)

{

	if (tracehook_report_syscall_entry(regs))

	if (ptrace_report_syscall_entry(regs))

		return ULONG_MAX;



	return regs->r8;
@@ -266,5 +265,5 @@ asmlinkage int syscall_trace_entry(struct pt_regs *regs) 


asmlinkage void syscall_trace_exit(struct pt_regs *regs)

{

	tracehook_report_syscall_exit(regs, 0);

	ptrace_report_syscall_exit(regs, 0);

}

arch/arm/kernel/ptrace.c

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/hw_breakpoint.h>

#include <linux/regset.h>

#include <linux/audit.h>

#include <linux/tracehook.h>

#include <linux/unistd.h>



#include <asm/syscall.h>
@@ -843,8 +842,8 @@ static void report_syscall(struct pt_regs *regs, enum ptrace_syscall_dir dir) 
	regs->ARM_ip = dir;



	if (dir == PTRACE_SYSCALL_EXIT)

		tracehook_report_syscall_exit(regs, 0);

	else if (tracehook_report_syscall_entry(regs))

		ptrace_report_syscall_exit(regs, 0);

	else if (ptrace_report_syscall_entry(regs))

		current_thread_info()->abi_syscall = -1;



	regs->ARM_ip = ip;

arch/arm64/kernel/ptrace.c

+3 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/perf_event.h>

#include <linux/hw_breakpoint.h>

#include <linux/regset.h>

#include <linux/tracehook.h>

#include <linux/elf.h>



#include <asm/compat.h>
@@ -1818,11 +1817,11 @@ static void report_syscall(struct pt_regs *regs, enum ptrace_syscall_dir dir) 
	regs->regs[regno] = dir;



	if (dir == PTRACE_SYSCALL_ENTER) {

		if (tracehook_report_syscall_entry(regs))

		if (ptrace_report_syscall_entry(regs))

			forget_syscall(regs);

		regs->regs[regno] = saved_reg;

	} else if (!test_thread_flag(TIF_SINGLESTEP)) {

		tracehook_report_syscall_exit(regs, 0);

		ptrace_report_syscall_exit(regs, 0);

		regs->regs[regno] = saved_reg;

	} else {

		regs->regs[regno] = saved_reg;
@@ -1832,7 +1831,7 @@ static void report_syscall(struct pt_regs *regs, enum ptrace_syscall_dir dir) 
		 * tracer modifications to the registers may have rewound the

		 * state machine.

		 */

		tracehook_report_syscall_exit(regs, 1);

		ptrace_report_syscall_exit(regs, 1);

	}

}