From: SF Markus Elfring <elfring@users.sourceforge.net>
To: linux-alpha@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Jan-Benedict Glaw <jbglaw@lug-owl.de>,
Matt Turner <mattst88@gmail.com>,
Nicolas Pitre <nicolas.pitre@linaro.org>,
Richard Cochran <richardcochran@gmail.com>,
Richard Henderson <rth@twiddle.net>,
Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 2/4] alpha: Move two assignments for the variable "error" in osf_utsname()
Date: Wed, 18 Jan 2017 12:46:52 +0100 [thread overview]
Message-ID: <5649cb94-620c-7b60-f150-a6838cafbfc6@users.sourceforge.net> (raw)
In-Reply-To: <de76a580-c693-f422-ad78-d87bafd42bf3@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 18 Jan 2017 11:10:03 +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.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
arch/alpha/kernel/osf_sys.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 41174156a676..73ff5d698591 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -528,20 +528,14 @@ SYSCALL_DEFINE1(osf_utsname, char __user *, name)
int error;
down_read(&uts_sem);
- error = -EFAULT;
- if (copy_to_user(name + 0, utsname()->sysname, 32))
- goto out;
- if (copy_to_user(name + 32, utsname()->nodename, 32))
- goto out;
- if (copy_to_user(name + 64, utsname()->release, 32))
- goto out;
- if (copy_to_user(name + 96, utsname()->version, 32))
- goto out;
- if (copy_to_user(name + 128, utsname()->machine, 32))
- goto out;
-
- error = 0;
- out:
+ if (copy_to_user(name + 0, utsname()->sysname, 32) ||
+ copy_to_user(name + 32, utsname()->nodename, 32) ||
+ copy_to_user(name + 64, utsname()->release, 32) ||
+ copy_to_user(name + 96, utsname()->version, 32) ||
+ copy_to_user(name + 128, utsname()->machine, 32))
+ error = -EFAULT;
+ else
+ error = 0;
up_read(&uts_sem);
return error;
}
--
2.11.0
next prev parent reply other threads:[~2017-01-18 11:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-18 11:40 [PATCH 0/4] alpha: Fine-tuning for five function implementations SF Markus Elfring
2017-01-18 11:45 ` [PATCH 1/4] alpha: Return an error code only as a constant in osf_sigstack() SF Markus Elfring
2017-01-18 11:46 ` SF Markus Elfring [this message]
2017-01-18 11:47 ` [PATCH 3/4] alpha: Return directly after a failed copy_from_user() or getname() in two functions SF Markus Elfring
2017-01-18 11:50 ` [PATCH 4/4] alpha: Move two assignments for the variable "res" in srm_env_proc_write() SF Markus Elfring
2017-01-18 13:14 ` Jan-Benedict Glaw
2017-01-18 14:27 ` SF Markus Elfring
2017-01-18 14:11 ` Al Viro
2017-01-18 15:41 ` alpha: Checking source code positions for the setting of error codes SF Markus Elfring
2017-01-18 17:43 ` Al Viro
2017-01-19 0:45 ` [PATCH 4/4] alpha: Move two assignments for the variable "res" in srm_env_proc_write() kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5649cb94-620c-7b60-f150-a6838cafbfc6@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=ink@jurassic.park.msu.ru \
--cc=jbglaw@lug-owl.de \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mattst88@gmail.com \
--cc=nicolas.pitre@linaro.org \
--cc=richardcochran@gmail.com \
--cc=rth@twiddle.net \
--cc=tglx@linutronix.de \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).