MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
authorFlorian Fainelli <florian@openwrt.org>
Mon, 10 Dec 2012 14:56:44 +0000 (15:56 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 13 Dec 2012 17:15:26 +0000 (18:15 +0100)
When CONFIG_UIDGID_STRICT_TYPE_CHECKS is enabled, plain integer checking
between different uids/gids is explicitely turned into a build failure
by making the k{uid,gid}_t types a structure containing a value:

arch/mips/kernel/mips-mt-fpaff.c: In function 'check_same_owner':
arch/mips/kernel/mips-mt-fpaff.c:53:22: error: invalid operands to
binary == (have 'kuid_t' and 'kuid_t')
arch/mips/kernel/mips-mt-fpaff.c:54:15: error: invalid operands to
binary == (have 'kuid_t' and 'kuid_t')

In order to ensure proper comparison between uids, using the helper
function uid_eq() which performs the right thing whenever this config
option is turned on or off.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Patchwork: https://patchwork.linux-mips.org/patch/4717/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/mips-mt-fpaff.c

index 33f63bab478a7478ad34733eaa861f3aba01e78b..fd814e08c945da41ad10f0582d7ccd7b7a8ab94f 100644 (file)
@@ -50,8 +50,8 @@ static bool check_same_owner(struct task_struct *p)
 
        rcu_read_lock();
        pcred = __task_cred(p);
-       match = (cred->euid == pcred->euid ||
-                cred->euid == pcred->uid);
+       match = (uid_eq(cred->euid, pcred->euid) ||
+                uid_eq(cred->euid, pcred->uid));
        rcu_read_unlock();
        return match;
 }