Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b1007c3 authored by Tejun Heo's avatar Tejun Heo Committed by Oleg Nesterov
Browse files

ptrace: remove silly wait_trap variable from ptrace_attach() 



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: default avatarTejun Heo <tj@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
parent 23c79d31

kernel/ptrace.c

+1 −3
Original line number Original line 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)

static int ptrace_attach(struct task_struct *task)

{

{

	bool wait_trap = false;

	int retval;

	int retval;





	audit_ptrace(task);

	audit_ptrace(task);
@@ -246,7 +245,6 @@ static int ptrace_attach(struct task_struct *task) 
	if (task_is_stopped(task)) {

	if (task_is_stopped(task)) {

		task->group_stop |= GROUP_STOP_PENDING | GROUP_STOP_TRAPPING;

		task->group_stop |= GROUP_STOP_PENDING | GROUP_STOP_TRAPPING;

		signal_wake_up(task, 1);

		signal_wake_up(task, 1);

		wait_trap = true;

	}

	}





	spin_unlock(&task->sighand->siglock);

	spin_unlock(&task->sighand->siglock);
@@ -257,7 +255,7 @@ unlock_tasklist: 
unlock_creds:

unlock_creds:

	mutex_unlock(&task->signal->cred_guard_mutex);

	mutex_unlock(&task->signal->cred_guard_mutex);

out:

out:

	if (wait_trap)

	if (!retval)

		wait_event(current->signal->wait_chldexit,

		wait_event(current->signal->wait_chldexit,

			   !(task->group_stop & GROUP_STOP_TRAPPING));

			   !(task->group_stop & GROUP_STOP_TRAPPING));

	return retval;

	return retval;