From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Wed, 18 Jan 2017 12:08:44 +0100
A local variable was set to an error code in two cases 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@xxxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/kernel/srm_env.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c
index ffe996a54fad..a5f182780578 100644
--- a/arch/alpha/kernel/srm_env.c
+++ b/arch/alpha/kernel/srm_env.c
@@ -113,13 +113,15 @@ static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer,
if (!buf)
return -ENOMEM;
- res = -EINVAL;
- if (count >= PAGE_SIZE)
+ if (count >= PAGE_SIZE) {
+ res = -EINVAL;
goto out;
+ }
- res = -EFAULT;
- if (copy_from_user(buf, buffer, count))
+ if (copy_from_user(buf, buffer, count)) {
+ res = -EFAULT;
goto out;
+ }
buf[count] = '\0';
ret1 = callback_setenv(id, buf, count);
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
