public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Dmitry Kasatkin <dmitry.kasatkin@gmail.com>,
	Mimi Zohar <zohar@linux.vnet.ibm.com>,
	linux-kernel@vger.kernel.org, linux-api@vger.kernel.org,
	Andrew Morton <akpm@linux-foundation.org>,
	Rasmus Villemoes <linux@rasmusvillemoes.dk>,
	linux-efi@vger.kernel.org,
	Matt Fleming <matt@codeblueprint.co.uk>,
	Arnd Bergmann <arnd@arndb.de>, "Theodore Ts'o" <tytso@mit.edu>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v3 06/10] sysctl: drop away useless label
Date: Tue,  5 Apr 2016 16:56:15 +0300	[thread overview]
Message-ID: <1459864579-55988-7-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1459864579-55988-1-git-send-email-andriy.shevchenko@linux.intel.com>

We have no locking in bin_uuid(). Thus, we may remove the out label and use
return statements directly.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 kernel/sysctl_binary.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index 10a1d7d..055ad65 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -1123,15 +1123,14 @@ static ssize_t bin_uuid(struct file *file,
 
 		result = kernel_read(file, 0, buf, sizeof(buf) - 1);
 		if (result < 0)
-			goto out;
+			return result;
 
 		buf[result] = '\0';
 
 		/* Convert the uuid to from a string to binary */
 		for (i = 0; i < 16; i++) {
-			result = -EIO;
 			if (!isxdigit(str[0]) || !isxdigit(str[1]))
-				goto out;
+				return -EIO;
 
 			uuid[i] = (hex_to_bin(str[0]) << 4) |
 					hex_to_bin(str[1]);
@@ -1143,15 +1142,12 @@ static ssize_t bin_uuid(struct file *file,
 		if (oldlen > 16)
 			oldlen = 16;
 
-		result = -EFAULT;
 		if (copy_to_user(oldval, uuid, oldlen))
-			goto out;
+			return -EFAULT;
 
 		copied = oldlen;
 	}
-	result = copied;
-out:
-	return result;
+	return copied;
 }
 
 static ssize_t bin_dn_node_address(struct file *file,
-- 
2.8.0.rc3

  parent reply	other threads:[~2016-04-05 13:57 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-05 13:56 [PATCH v3 00/10] uuid: convert users to generic UUID API Andy Shevchenko
2016-04-05 13:56 ` [PATCH v3 01/10] lib/vsprintf: simplify UUID printing Andy Shevchenko
2016-04-05 13:56 ` [PATCH v3 02/10] ima: use %pU to output UUID in printable format Andy Shevchenko
2016-04-05 23:16   ` Joe Perches
2016-04-06 11:02     ` Andy Shevchenko
2016-04-05 13:56 ` [PATCH v3 03/10] lib/uuid: move generate_random_uuid() to uuid.c Andy Shevchenko
2016-04-05 13:56 ` [PATCH v3 04/10] lib/uuid: introduce few more generic helpers for UUID Andy Shevchenko
2016-04-05 14:15   ` Andy Shevchenko
2016-04-05 13:56 ` [PATCH v3 05/10] lib/uuid: remove FSF address Andy Shevchenko
2016-04-05 13:56 ` Andy Shevchenko [this message]
2016-04-05 22:17   ` [PATCH v3 06/10] sysctl: drop away useless label Andrew Morton
2016-04-06 11:34     ` Andy Shevchenko
2016-04-05 13:56 ` [PATCH v3 07/10] sysctl: use generic UUID library Andy Shevchenko
2016-04-05 13:56 ` [PATCH v3 08/10] efi: redefine type, constant, macro from generic code Andy Shevchenko
2016-04-05 13:56 ` [PATCH v3 09/10] efivars: use generic UUID library Andy Shevchenko
2016-04-05 13:56 ` [PATCH v3 10/10] genhd: move to " Andy Shevchenko

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=1459864579-55988-7-git-send-email-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=dmitry.kasatkin@gmail.com \
    --cc=linux-api@vger.kernel.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@rasmusvillemoes.dk \
    --cc=matt@codeblueprint.co.uk \
    --cc=tytso@mit.edu \
    --cc=zohar@linux.vnet.ibm.com \
    /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