diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 17:33:32 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-04 17:33:32 +1100 |
commit | b894d099e1cc413305d5a1649816701ec291538d (patch) | |
tree | 570196112e04fa091b87be4ba0b84fcb250de53f /kernel/futex.c | |
parent | fc2985800d164066d9fd4ab2334bea6380d4472d (diff) | |
parent | 3496f92beb9aa99ef21fccc154a36c7698e9c538 (diff) |
Merge commit 'security-testing/next'
Conflicts:
fs/cifs/cifs_fs_sb.h
fs/nfsd/nfs4recover.c
fs/ocfs2/namei.c
Diffstat (limited to 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index ba0d3b83c091..8fda81512adb 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -405,13 +405,20 @@ static void free_pi_state(struct futex_pi_state *pi_state) static struct task_struct * futex_find_get_task(pid_t pid) { struct task_struct *p; + const struct cred *cred = current_cred(), *pcred; rcu_read_lock(); p = find_task_by_vpid(pid); - if (!p || ((current->euid != p->euid) && (current->euid != p->uid))) + if (!p) { p = ERR_PTR(-ESRCH); - else - get_task_struct(p); + } else { + pcred = __task_cred(p); + if (cred->euid != pcred->euid && + cred->euid != pcred->uid) + p = ERR_PTR(-ESRCH); + else + get_task_struct(p); + } rcu_read_unlock(); @@ -1748,6 +1755,7 @@ sys_get_robust_list(int pid, struct robust_list_head __user * __user *head_ptr, { struct robust_list_head __user *head; unsigned long ret; + const struct cred *cred = current_cred(), *pcred; if (!futex_cmpxchg_enabled) return -ENOSYS; @@ -1763,8 +1771,10 @@ sys_get_robust_list(int pid, struct robust_list_head __user * __user *head_ptr, if (!p) goto err_unlock; ret = -EPERM; - if ((current->euid != p->euid) && (current->euid != p->uid) && - !capable(CAP_SYS_PTRACE)) + pcred = __task_cred(p); + if (cred->euid != pcred->euid && + cred->euid != pcred->uid && + !capable(CAP_SYS_PTRACE)) goto err_unlock; head = p->robust_list; rcu_read_unlock(); |