mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 03:36:19 +00:00
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
This commit is contained in:
commit
51b3960e78
1 changed files with 2 additions and 2 deletions
|
@ -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(¤t->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(¤t->cred_exec_mutex);
|
||||
mutex_unlock(&task->cred_exec_mutex);
|
||||
out:
|
||||
return retval;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue