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

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
...@@ -188,7 +188,7 @@ int ptrace_attach(struct task_struct *task) ...@@ -188,7 +188,7 @@ int ptrace_attach(struct task_struct *task)
/* Protect exec's credential calculations against our interference; /* Protect exec's credential calculations against our interference;
* SUID, SGID and LSM creds get determined differently under ptrace. * 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) if (retval < 0)
goto out; goto out;
...@@ -232,7 +232,7 @@ int ptrace_attach(struct task_struct *task) ...@@ -232,7 +232,7 @@ int ptrace_attach(struct task_struct *task)
bad: bad:
write_unlock_irqrestore(&tasklist_lock, flags); write_unlock_irqrestore(&tasklist_lock, flags);
task_unlock(task); task_unlock(task);
mutex_unlock(&current->cred_exec_mutex); mutex_unlock(&task->cred_exec_mutex);
out: out:
return retval; return retval;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment