From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, Theodore Ts'o <tytso@mit.edu>, Arnd Bergmann <arnd@arndb.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Jani Nikula <jani.nikula@linux.intel.com>, David Airlie <airlied@linux.ie>, Benjamin Tissoires <benjamin.tissoires@redhat.com>, Bjorn Helgaas <bhelgaas@google.com>, Mathias Nyman <mathias.nyman@intel.com>, Matt Fleming <matt@codeblueprint.co.uk>, Lv Zheng <lv.zheng@intel.com>, Mark Brown <broonie@kernel.org>, Zhang Rui <rui.zhang@intel.com>, Mika Westerberg <mika.westerberg@linux.intel.com>, Andrew Morton <akpm@linux-foundation.org>, Rasmus Villemoes <linux@rasmusvillemoes.dk>, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-efi@vger.kernel.org, linux-api@vger.kernel.org, linux-nvdimm@lists.01.org Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Subject: [PATCH v1 07/10] sysctl: drop away useless label Date: Wed, 17 Feb 2016 14:17:25 +0200 [thread overview] Message-ID: <1455711448-124103-8-git-send-email-andriy.shevchenko@linux.intel.com> (raw) In-Reply-To: <1455711448-124103-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 7e7746a..509abe4 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.7.0
WARNING: multiple messages have this Message-ID (diff)
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> To: "Rafael J. Wysocki" <rjw@rjwysocki.net>, "Theodore Ts'o" <tytso@mit.edu>, Arnd Bergmann <arnd@arndb.de>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>, Jani Nikula <jani.nikula@linux.intel.com>, David Airlie <airlied@linux.ie>, Benjamin Tissoires <benjamin.tissoires@redhat.com>, Bjorn Helgaas <bhelgaas@google.com>, Mathias Nyman <mathias.nyman@intel.com>, Matt Fleming <matt@codeblueprint.co.uk>, Lv Zheng <lv.zheng@intel.com>, Mark Brown <broonie@kernel.org>, Zhang Rui <rui.zhang@intel.com>, Mika Westerberg <mika.westerberg@linux.intel.com>, Andrew Morton <akpm@linux-foundation.org>, Rasmus Villemoes <linux@rasmusvillemoes.dk>, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-efi@vger.kernel.org, linux-api@vger.kernel.org, linux-nvdimm@ml01.01.org Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Subject: [PATCH v1 07/10] sysctl: drop away useless label Date: Wed, 17 Feb 2016 14:17:25 +0200 [thread overview] Message-ID: <1455711448-124103-8-git-send-email-andriy.shevchenko@linux.intel.com> (raw) In-Reply-To: <1455711448-124103-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 7e7746a..509abe4 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.7.0
next prev parent reply other threads:[~2016-02-17 12:17 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-17 12:17 [PATCH v1 00/10] uuid: convert users to generic UUID API Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` [PATCH v1 01/10] lib/vsprintf: simplify UUID printing Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` [PATCH v1 02/10] lib/uuid: move generate_random_uuid() to uuid.c Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` [PATCH v1 03/10] lib/uuid: introduce few more generic helpers for UUID Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` [PATCH v1 04/10] lib/uuid: remove FSF address Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` [PATCH v1 05/10] ACPI: switch to use generic UUID API Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 17:49 ` Dan Williams 2016-02-17 17:49 ` Dan Williams 2016-02-17 17:49 ` Dan Williams 2016-02-26 13:46 ` Andy Shevchenko 2016-02-26 13:46 ` Andy Shevchenko 2016-02-26 13:46 ` Andy Shevchenko 2016-02-17 12:17 ` [PATCH v1 06/10] device property: switch to use " Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-18 0:03 ` Rafael J. Wysocki 2016-02-18 0:03 ` Rafael J. Wysocki 2016-02-18 0:03 ` Rafael J. Wysocki 2016-02-26 14:11 ` Andy Shevchenko 2016-02-26 14:11 ` Andy Shevchenko 2016-02-26 14:11 ` Andy Shevchenko 2016-04-07 16:41 ` Andy Shevchenko 2016-04-07 16:41 ` Andy Shevchenko 2016-04-07 16:41 ` Andy Shevchenko 2016-04-08 1:27 ` Huang, Ying 2016-04-08 1:27 ` Huang, Ying 2016-04-08 1:27 ` Huang, Ying 2016-04-08 10:00 ` Andy Shevchenko 2016-04-08 10:00 ` Andy Shevchenko 2016-04-08 10:00 ` Andy Shevchenko 2016-04-08 23:46 ` huang ying 2016-04-08 23:46 ` huang ying 2016-04-08 23:46 ` huang ying 2016-02-18 11:07 ` Mika Westerberg 2016-02-18 11:07 ` Mika Westerberg 2016-02-26 14:28 ` Andy Shevchenko 2016-02-26 14:28 ` Andy Shevchenko 2016-02-26 14:28 ` Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko [this message] 2016-02-17 12:17 ` [PATCH v1 07/10] sysctl: drop away useless label Andy Shevchenko 2016-02-17 12:17 ` [PATCH v1 08/10] sysctl: use generic UUID library Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` [PATCH v1 09/10] efi: redefine type, constant, macro from generic code Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` [PATCH v1 10/10] efivars: use generic UUID library Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-17 12:17 ` Andy Shevchenko 2016-02-18 15:07 ` Matt Fleming 2016-02-18 15:07 ` Matt Fleming 2016-02-26 14:29 ` Andy Shevchenko 2016-02-26 14:29 ` Andy Shevchenko 2016-02-26 14:29 ` 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=1455711448-124103-8-git-send-email-andriy.shevchenko@linux.intel.com \ --to=andriy.shevchenko@linux.intel.com \ --cc=airlied@linux.ie \ --cc=akpm@linux-foundation.org \ --cc=arnd@arndb.de \ --cc=benjamin.tissoires@redhat.com \ --cc=bhelgaas@google.com \ --cc=broonie@kernel.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=gregkh@linuxfoundation.org \ --cc=jani.nikula@linux.intel.com \ --cc=jarkko.sakkinen@linux.intel.com \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-api@vger.kernel.org \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvdimm@lists.01.org \ --cc=linux@rasmusvillemoes.dk \ --cc=lv.zheng@intel.com \ --cc=mathias.nyman@intel.com \ --cc=matt@codeblueprint.co.uk \ --cc=mika.westerberg@linux.intel.com \ --cc=rjw@rjwysocki.net \ --cc=rui.zhang@intel.com \ --cc=tytso@mit.edu \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.