diff options
| author |   Tony Lindgren <tony@atomide.com> | 2017-08-10 09:05:53 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2017-08-10 09:05:53 -0700 |
| commit | c002c27874faaa170b535d03d7efee89ecdd9be4 (patch) | |
| tree | 70d91eba77a9c374e4f0bf9eb8636acba57ca173 /kernel/sysctl_binary.c | |
| parent | ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes (diff) | |
| parent | Linux v4.13-rc1 (diff) | |
Merge tag 'v4.13-rc1' into omap-for-v4.14/mmc-regulator
Linux v4.13-rc1
Diffstat (limited to 'kernel/sysctl_binary.c')
| -rw-r--r-- | kernel/sysctl_binary.c | 6 |
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, /* Only supports reads */ if (oldval && oldlen) { char buf[UUID_STRING_LEN + 1]; - uuid_be uuid; + uuid_t uuid; result = kernel_read(file, 0, buf, sizeof(buf) - 1); if (result < 0) @@ -1128,7 +1128,7 @@ static ssize_t bin_uuid(struct file *file, buf[result] = '\0'; result = -EIO; - if (uuid_be_to_bin(buf, &uuid)) + if (uuid_parse(buf, &uuid)) goto out; if (oldlen > 16) @@ -1346,7 +1346,7 @@ static void deprecated_sysctl_warning(const int *name, int nlen) * CTL_KERN/KERN_VERSION is used by older glibc and cannot * ever go away. */ - if (name[0] == CTL_KERN && name[1] == KERN_VERSION) + if (nlen >= 2 && name[0] == CTL_KERN && name[1] == KERN_VERSION) return; if (printk_ratelimit()) { |