[PATCH v1 07/10] sysctl: drop away useless label
flat view
STALE3855d
SUPERSEDED
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: 2016-02-17 12:19:47
Also in:
dri-devel, linux-acpi, linux-efi, lkml, nvdimm
Subsystem:
proc sysctl, the rest · Maintainers:
Kees Cook, Joel Granados, Linus Torvalds
Status: Superseded by v3 (posted 2016-04-05). [go to v3]
Revision v1 (3 revisions archived).
Revisions (3)
- v1 current
- v2 [diff against previous]
- v3 [diff against previous]
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