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

Commit 51b3960e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  ptrace: ptrace_attach: fix the usage of ->cred_exec_mutex
parents f70616ac cad81bc2

kernel/ptrace.c

+2 −2
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ int ptrace_attach(struct task_struct *task) 
	/* Protect exec's credential calculations against our interference;

	 * SUID, SGID and LSM creds get determined differently under ptrace.

	 */

	retval = mutex_lock_interruptible(&current->cred_exec_mutex);

	retval = mutex_lock_interruptible(&task->cred_exec_mutex);

	if (retval  < 0)

		goto out;
@@ -232,7 +232,7 @@ repeat: 
bad:

	write_unlock_irqrestore(&tasklist_lock, flags);

	task_unlock(task);

	mutex_unlock(&current->cred_exec_mutex);

	mutex_unlock(&task->cred_exec_mutex);

out:

	return retval;

}