From 0fc704b15c1e4cde3866dbed9f8497c3d28e1fdd Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Fri, 14 Nov 2008 10:38:37 +1100
Subject: [PATCH] --- yaml --- r: 120659 b: refs/heads/master c:
 b4212737a39e4cfb0fb66769acbc0bd182a93253 h: refs/heads/master i:   120657:
 2a1b8c17da193ee8803335899ae23ce05893d233   120655:
 48bce6f4fb1748810d4014c1cfd9855f03de50c1 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/mips/kernel/mips-mt-fpaff.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 573b26e1fad2..2c6b78df0a0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef81ee9855d6c605ed6090a8018c78572cc68b5c
+refs/heads/master: b4212737a39e4cfb0fb66769acbc0bd182a93253
diff --git a/trunk/arch/mips/kernel/mips-mt-fpaff.c b/trunk/arch/mips/kernel/mips-mt-fpaff.c
index dc9eb72ed9de..5e77a3a21f98 100644
--- a/trunk/arch/mips/kernel/mips-mt-fpaff.c
+++ b/trunk/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;
 	}