Commit 1930a6e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ptrace-cleanups-for-v5.18' of... 

Merge tag 'ptrace-cleanups-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull ptrace cleanups from Eric Biederman:
 "This set of changes removes tracehook.h, moves modification of all of
  the ptrace fields inside of siglock to remove races, adds a missing
  permission check to ptrace.c

  The removal of tracehook.h is quite significant as it has been a major
  source of confusion in recent years. Much of that confusion was around
  task_work and TIF_NOTIFY_SIGNAL (which I have now decoupled making the
  semantics clearer).

  For people who don't know tracehook.h is a vestiage of an attempt to
  implement uprobes like functionality that was never fully merged, and
  was later superseeded by uprobes when uprobes was merged. For many
  years now we have been removing what tracehook functionaly a little
  bit at a time. To the point where anything left in tracehook.h was
  some weird strange thing that was difficult to understand"

* tag 'ptrace-cleanups-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  ptrace: Remove duplicated include in ptrace.c
  ptrace: Check PTRACE_O_SUSPEND_SECCOMP permission on PTRACE_SEIZE
  ptrace: Return the signal to continue with from ptrace_stop
  ptrace: Move setting/clearing ptrace_message into ptrace_stop
  tracehook: Remove tracehook.h
  resume_user_mode: Move to resume_user_mode.h
  resume_user_mode: Remove #ifdef TIF_NOTIFY_RESUME in set_notify_resume
  signal: Move set_notify_signal and clear_notify_signal into sched/signal.h
  task_work: Decouple TIF_NOTIFY_SIGNAL and task_work
  task_work: Call tracehook_notify_signal from get_signal on all architectures
  task_work: Introduce task_work_pending
  task_work: Remove unnecessary include from posix_timers.h
  ptrace: Remove tracehook_signal_handler
  ptrace: Remove arch_syscall_{enter,exit}_tracehook
  ptrace: Create ptrace_report_syscall_{entry,exit} in ptrace.h
  ptrace/arm: Rename tracehook_report_syscall report_syscall
  ptrace: Move ptrace_report_syscall into ptrace.h
parents 0a815d01 dcbc65aa

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -15930,7 +15930,6 @@ F: arch/*/ptrace*.c 
F:	include/asm-generic/syscall.h

F:	include/linux/ptrace.h

F:	include/linux/regset.h

F:	include/linux/tracehook.h

F:	include/uapi/linux/ptrace.h

F:	include/uapi/linux/ptrace.h

F:	kernel/ptrace.c

arch/Kconfig

+2 −3
Original line number Diff line number Diff line
@@ -217,9 +217,8 @@ 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_NOTIFY_RESUME	calls tracehook_notify_resume()

#	signal delivery		calls tracehook_signal_handler()

#	TIF_SYSCALL_TRACE	calls ptrace_report_syscall_{entry,exit}

#	TIF_NOTIFY_RESUME	calls resume_user_mode_work()

#

config HAVE_ARCH_TRACEHOOK

	bool

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/alpha/kernel/signal.c

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

#include <linux/bitops.h>

#include <linux/syscalls.h>

#include <linux/tracehook.h>

#include <linux/resume_user_mode.h>



#include <linux/uaccess.h>

#include <asm/sigcontext.h>
@@ -531,7 +531,7 @@ do_work_pending(struct pt_regs *regs, unsigned long thread_flags, 
				do_signal(regs, r0, r19);

				r0 = 0;

			} else {

				tracehook_notify_resume(regs);

				resume_user_mode_work(regs);

			}

		}

		local_irq_disable();

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);

}