diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2017-05-18 10:19:33 -0600 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-05-18 10:19:33 -0600 |
| commit | a1a9af4e9d9ec65c22d3cfe449e0420d17dbedba (patch) | |
| tree | 05bd08bb1987aa92b84b49b9ee4eee0ba3b2917f /arch/sparc/kernel/led.c | |
| parent | 25a0da73f24c95d57381bedd9cd89e4929b1bfde (diff) | |
| parent | 2ea659a9ef488125eb46da6eb571de5eae5c43f6 (diff) | |
Merge tag 'v4.12-rc1' into docs-next
Linux 4.12-rc1
Diffstat (limited to 'arch/sparc/kernel/led.c')
| -rw-r--r-- | arch/sparc/kernel/led.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c index 44a3ed93c214..e278bf52963b 100644 --- a/arch/sparc/kernel/led.c +++ b/arch/sparc/kernel/led.c @@ -70,16 +70,9 @@ static ssize_t led_proc_write(struct file *file, const char __user *buffer, if (count > LED_MAX_LENGTH) count = LED_MAX_LENGTH; - buf = kmalloc(sizeof(char) * (count + 1), GFP_KERNEL); - if (!buf) - return -ENOMEM; - - if (copy_from_user(buf, buffer, count)) { - kfree(buf); - return -EFAULT; - } - - buf[count] = '\0'; + buf = memdup_user_nul(buffer, count); + if (IS_ERR(buf)) + return PTR_ERR(buf); /* work around \n when echo'ing into proc */ if (buf[count - 1] == '\n') |