diff options
author | David Howells <dhowells@redhat.com> | 2008-11-13 18:39:16 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-13 18:39:16 -0500 |
commit | b6dff3ec5e116e3af6f537d4caedcad6b9e5082a (patch) | |
tree | 9e76f972eb7ce9b84e0146c8e4126a3f86acb428 /kernel/futex.c | |
parent | 15a2460ed0af7538ca8e6c610fe607a2cd9da142 (diff) |
CRED: Separate task security context from task_struct
Separate the task security context from task_struct. At this point, the
security data is temporarily embedded in the task_struct with two pointers
pointing to it.
Note that the Alpha arch is altered as it refers to (E)UID and (E)GID in
entry.S via asm-offsets.
With comment fixes Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index e06962132aaf..28421d8210b8 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
@@ -443,7 +443,8 @@ static struct task_struct * futex_find_get_task(pid_t pid) | |||
443 | 443 | ||
444 | rcu_read_lock(); | 444 | rcu_read_lock(); |
445 | p = find_task_by_vpid(pid); | 445 | p = find_task_by_vpid(pid); |
446 | if (!p || (euid != p->euid && euid != p->uid)) | 446 | if (!p || (euid != p->cred->euid && |
447 | euid != p->cred->uid)) | ||
447 | p = ERR_PTR(-ESRCH); | 448 | p = ERR_PTR(-ESRCH); |
448 | else | 449 | else |
449 | get_task_struct(p); | 450 | get_task_struct(p); |
@@ -1846,7 +1847,8 @@ sys_get_robust_list(int pid, struct robust_list_head __user * __user *head_ptr, | |||
1846 | if (!p) | 1847 | if (!p) |
1847 | goto err_unlock; | 1848 | goto err_unlock; |
1848 | ret = -EPERM; | 1849 | ret = -EPERM; |
1849 | if (euid != p->euid && euid != p->uid && | 1850 | if (euid != p->cred->euid && |
1851 | euid != p->cred->uid && | ||
1850 | !capable(CAP_SYS_PTRACE)) | 1852 | !capable(CAP_SYS_PTRACE)) |
1851 | goto err_unlock; | 1853 | goto err_unlock; |
1852 | head = p->robust_list; | 1854 | head = p->robust_list; |