]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
MIPS: MT: Move an assignment for the variable "retval" in mipsmt_sys_sched_setaffinity()
authorMarkus Elfring <elfring@users.sourceforge.net>
Wed, 18 Jan 2017 18:18:37 +0000 (19:18 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 25 Jan 2017 01:51:11 +0000 (02:51 +0100)
A local variable was set to an error code in one case before a concrete
error situation was detected. Thus move the corresponding assignment into
an if branch to indicate a software failure there.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-mips@linux-mips.org
Cc: LKML <linux-kernel@vger.kernel.org>
Cc: kernel-janitors@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/15072/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/mips-mt-fpaff.c

index a12904ea9f655c2c64c7381556c6c0a57b76252d..1a0a3b4ecc3efb37ef9db3a23d5acb1dc06a3b8d 100644 (file)
@@ -99,9 +99,10 @@ asmlinkage long mipsmt_sys_sched_setaffinity(pid_t pid, unsigned int len,
                retval = -ENOMEM;
                goto out_free_new_mask;
        }
-       retval = -EPERM;
-       if (!check_same_owner(p) && !capable(CAP_SYS_NICE))
+       if (!check_same_owner(p) && !capable(CAP_SYS_NICE)) {
+               retval = -EPERM;
                goto out_unlock;
+       }
 
        retval = security_task_setscheduler(p);
        if (retval)