diff options
author | David Howells <dhowells@redhat.com> | 2009-05-08 08:55:22 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-05-10 18:15:36 -0400 |
commit | 5e751e992f3fb08ba35e1ca8095ec8fbf9eda523 (patch) | |
tree | 711b1b47622dc9661f1d3d9c67d55c0b21456e8c /include/linux | |
parent | d254117099d711f215e62427f55dfb8ebd5ad011 (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 'include/linux')
-rw-r--r-- | include/linux/init_task.h | 4 | ||||
-rw-r--r-- | include/linux/sched.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index d87247d2641f..7f54ba942429 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -145,8 +145,8 @@ extern struct cred init_cred; | |||
145 | .group_leader = &tsk, \ | 145 | .group_leader = &tsk, \ |
146 | .real_cred = &init_cred, \ | 146 | .real_cred = &init_cred, \ |
147 | .cred = &init_cred, \ | 147 | .cred = &init_cred, \ |
148 | .cred_exec_mutex = \ | 148 | .cred_guard_mutex = \ |
149 | __MUTEX_INITIALIZER(tsk.cred_exec_mutex), \ | 149 | __MUTEX_INITIALIZER(tsk.cred_guard_mutex), \ |
150 | .comm = "swapper", \ | 150 | .comm = "swapper", \ |
151 | .thread = INIT_THREAD, \ | 151 | .thread = INIT_THREAD, \ |
152 | .fs = &init_fs, \ | 152 | .fs = &init_fs, \ |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 3fa82b353c98..5932ace22400 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1247,7 +1247,9 @@ struct task_struct { | |||
1247 | * credentials (COW) */ | 1247 | * credentials (COW) */ |
1248 | const struct cred *cred; /* effective (overridable) subjective task | 1248 | const struct cred *cred; /* effective (overridable) subjective task |
1249 | * credentials (COW) */ | 1249 | * credentials (COW) */ |
1250 | struct mutex cred_exec_mutex; /* execve vs ptrace cred calculation mutex */ | 1250 | struct mutex cred_guard_mutex; /* guard against foreign influences on |
1251 | * credential calculations | ||
1252 | * (notably. ptrace) */ | ||
1251 | 1253 | ||
1252 | char comm[TASK_COMM_LEN]; /* executable name excluding path | 1254 | char comm[TASK_COMM_LEN]; /* executable name excluding path |
1253 | - access with [gs]et_task_comm (which lock | 1255 | - access with [gs]et_task_comm (which lock |