diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-27 08:38:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-27 08:38:51 -0700 |
| commit | 51b3960e78575f96c989d08421596bb6ab569f44 (patch) | |
| tree | fa6ec27c8fb2a2f9cfd278193a01a6b51d1a77b5 /kernel | |
| parent | f70616acacd956aaa819fd2e3a0d0152f1bc812b (diff) | |
| parent | cad81bc2529ab8c62b6fdc83a1c0c7f4a87209eb (diff) | |
| download | linux-51b3960e78575f96c989d08421596bb6ab569f44.tar.gz linux-51b3960e78575f96c989d08421596bb6ab569f44.tar.bz2 linux-51b3960e78575f96c989d08421596bb6ab569f44.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/ptrace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index dfcd83ceee3b..0692ab5a0d67 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -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; } |