aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl_binary.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sysctl_binary.c')
-rw-r--r--kernel/sysctl_binary.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index ece4b177052b..02e1859f2ca8 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -1119,7 +1119,7 @@ static ssize_t bin_uuid(struct file *file,
1119 /* Only supports reads */ 1119 /* Only supports reads */
1120 if (oldval && oldlen) { 1120 if (oldval && oldlen) {
1121 char buf[UUID_STRING_LEN + 1]; 1121 char buf[UUID_STRING_LEN + 1];
1122 uuid_be uuid; 1122 uuid_t uuid;
1123 1123
1124 result = kernel_read(file, 0, buf, sizeof(buf) - 1); 1124 result = kernel_read(file, 0, buf, sizeof(buf) - 1);
1125 if (result < 0) 1125 if (result < 0)
@@ -1128,7 +1128,7 @@ static ssize_t bin_uuid(struct file *file,
1128 buf[result] = '\0'; 1128 buf[result] = '\0';
1129 1129
1130 result = -EIO; 1130 result = -EIO;
1131 if (uuid_be_to_bin(buf, &uuid)) 1131 if (uuid_parse(buf, &uuid))
1132 goto out; 1132 goto out;
1133 1133
1134 if (oldlen > 16) 1134 if (oldlen > 16)
@@ -1346,7 +1346,7 @@ static void deprecated_sysctl_warning(const int *name, int nlen)
1346 * CTL_KERN/KERN_VERSION is used by older glibc and cannot 1346 * CTL_KERN/KERN_VERSION is used by older glibc and cannot
1347 * ever go away. 1347 * ever go away.
1348 */ 1348 */
1349 if (name[0] == CTL_KERN && name[1] == KERN_VERSION) 1349 if (nlen >= 2 && name[0] == CTL_KERN && name[1] == KERN_VERSION)
1350 return; 1350 return;
1351 1351
1352 if (printk_ratelimit()) { 1352 if (printk_ratelimit()) {