aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/ptrace.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2009-05-08 08:55:22 -0400
committerJames Morris <jmorris@namei.org>2009-05-10 18:15:36 -0400
commit5e751e992f3fb08ba35e1ca8095ec8fbf9eda523 (patch)
tree711b1b47622dc9661f1d3d9c67d55c0b21456e8c /kernel/ptrace.c
parentd254117099d711f215e62427f55dfb8ebd5ad011 (diff)
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/ptrace.c')
-rw-r--r--kernel/ptrace.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 0692ab5a0d67..27ac80298bfa 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -185,10 +185,11 @@ int ptrace_attach(struct task_struct *task)
185 if (same_thread_group(task, current)) 185 if (same_thread_group(task, current))
186 goto out; 186 goto out;
187 187
188 /* Protect exec's credential calculations against our interference; 188 /* Protect the target's credential calculations against our
189 * SUID, SGID and LSM creds get determined differently under ptrace. 189 * interference; SUID, SGID and LSM creds get determined differently
190 * under ptrace.
190 */ 191 */
191 retval = mutex_lock_interruptible(&task->cred_exec_mutex); 192 retval = mutex_lock_interruptible(&task->cred_guard_mutex);
192 if (retval < 0) 193 if (retval < 0)
193 goto out; 194 goto out;
194 195
@@ -232,7 +233,7 @@ repeat:
232bad: 233bad:
233 write_unlock_irqrestore(&tasklist_lock, flags); 234 write_unlock_irqrestore(&tasklist_lock, flags);
234 task_unlock(task); 235 task_unlock(task);
235 mutex_unlock(&task->cred_exec_mutex); 236 mutex_unlock(&task->cred_guard_mutex);
236out: 237out:
237 return retval; 238 return retval;
238} 239}