ptrace: remove silly wait_trap variable from ptrace_attach() (0b1007c3) · Commits · 戴 / test

Remove local variable wait_trap which determines whether to wait for !TRAPPING or not and simply wait for it if attach was successful. -v2: Oleg pointed out wait should happen iff attach was successful. Signed-off-by:

Tejun Heo <tj@kernel.org> Cc: Oleg Nesterov <oleg@redhat.com> Signed-off-by:

Oleg Nesterov <oleg@redhat.com>

kernel/ptrace.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -184,7 +184,6 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)

		static int ptrace_attach(struct task_struct *task)
		{
		bool wait_trap = false;
		int retval;

		audit_ptrace(task);
		@@ -246,7 +245,6 @@ static int ptrace_attach(struct task_struct *task)
		if (task_is_stopped(task)) {
		task->group_stop \|= GROUP_STOP_PENDING \| GROUP_STOP_TRAPPING;
		signal_wake_up(task, 1);
		wait_trap = true;
		}

		spin_unlock(&task->sighand->siglock);
		@@ -257,7 +255,7 @@ unlock_tasklist:
		unlock_creds:
		mutex_unlock(&task->signal->cred_guard_mutex);
		out:
		if (wait_trap)
		if (!retval)
		wait_event(current->signal->wait_chldexit,
		!(task->group_stop & GROUP_STOP_TRAPPING));
		return retval;

Admin message