Merge commit 'kumar/kumar-next' into next

[sfrench/cifs-2.6.git] / arch / mips / kernel / mips-mt-fpaff.c

diff --git a/arch/mips/kernel/mips-mt-fpaff.c b/arch/mips/kernel/mips-mt-fpaff.c
index dc9eb72ed9de956164f557b0757496dae6638c2e..5e77a3a21f98e7926cc789915ad65bbe64911a1a 100644 (file)
--- a/arch/mips/kernel/mips-mt-fpaff.c
+++ b/arch/mips/kernel/mips-mt-fpaff.c
@@ -51,6 +51,7 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
        int retval;
        struct task_struct *p;
        struct thread_info *ti;
+       uid_t euid;
 
        if (len < sizeof(new_mask))
                return -EINVAL;
@@ -76,9 +77,9 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
         */
        get_task_struct(p);
 
+       euid = current_euid();
        retval = -EPERM;
-       if ((current->euid != p->euid) && (current->euid != p->uid) &&
-                       !capable(CAP_SYS_NICE)) {
+       if (euid != p->euid && euid != p->uid && !capable(CAP_SYS_NICE)) {
                read_unlock(&tasklist_lock);
                goto out_unlock;
        }