diff options
| author | David Howells <dhowells@redhat.com> | 2009-05-08 13:55:22 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-11 08:15:36 +1000 |
| commit | 5e751e992f3fb08ba35e1ca8095ec8fbf9eda523 (patch) | |
| tree | 711b1b47622dc9661f1d3d9c67d55c0b21456e8c /kernel | |
| parent | d254117099d711f215e62427f55dfb8ebd5ad011 (diff) | |
| download | kernel_samsung_smdk4412-5e751e992f3fb08ba35e1ca8095ec8fbf9eda523.zip kernel_samsung_smdk4412-5e751e992f3fb08ba35e1ca8095ec8fbf9eda523.tar.gz kernel_samsung_smdk4412-5e751e992f3fb08ba35e1ca8095ec8fbf9eda523.tar.bz2 | |
CRED: Rename cred_exec_mutex to reflect that it's a guard against ptrace
Rename cred_exec_mutex to reflect that it's a guard against foreign
intervention on a process's credential state, such as is made by ptrace(). The
attachment of a debugger to a process affects execve()'s calculation of the new
credential state - _and_ also setprocattr()'s calculation of that state.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cred.c | 4 | ||||
| -rw-r--r-- | kernel/ptrace.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/kernel/cred.c b/kernel/cred.c index 3a03918..1bb4d7e 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -167,7 +167,7 @@ EXPORT_SYMBOL(prepare_creds); /* * Prepare credentials for current to perform an execve() - * - The caller must hold current->cred_exec_mutex + * - The caller must hold current->cred_guard_mutex */ struct cred *prepare_exec_creds(void) { @@ -276,7 +276,7 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags) struct cred *new; int ret; - mutex_init(&p->cred_exec_mutex); + mutex_init(&p->cred_guard_mutex); if ( #ifdef CONFIG_KEYS diff --git a/kernel/ptrace.c b/kernel/ptrace.c index 0692ab5..27ac802 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -185,10 +185,11 @@ int ptrace_attach(struct task_struct *task) if (same_thread_group(task, current)) goto out; - /* Protect exec's credential calculations against our interference; - * SUID, SGID and LSM creds get determined differently under ptrace. + /* Protect the target's credential calculations against our + * interference; SUID, SGID and LSM creds get determined differently + * under ptrace. */ - retval = mutex_lock_interruptible(&task->cred_exec_mutex); + retval = mutex_lock_interruptible(&task->cred_guard_mutex); if (retval < 0) goto out; @@ -232,7 +233,7 @@ repeat: bad: write_unlock_irqrestore(&tasklist_lock, flags); task_unlock(task); - mutex_unlock(&task->cred_exec_mutex); + mutex_unlock(&task->cred_guard_mutex); out: return retval; } |