diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2016-01-02 14:53:28 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-04 10:29:45 -0500 |
| commit | 793b796ebfcb3157fe80056a719096a550f0c7d0 (patch) | |
| tree | 0be940b462012ee2887a3d09dfd60ade3edacddd /arch/um | |
| parent | [um] hostaudio: don't open-code memdup_user() (diff) | |
| download | linux-dev-793b796ebfcb3157fe80056a719096a550f0c7d0.tar.xz linux-dev-793b796ebfcb3157fe80056a719096a550f0c7d0.zip | |
[um] mconsole: don't open-code memdup_user_nul()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/drivers/mconsole_kern.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index 29880c9b324e..b821b13d343a 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c @@ -748,19 +748,11 @@ static ssize_t mconsole_proc_write(struct file *file, { char *buf; - buf = kmalloc(count + 1, GFP_KERNEL); - if (buf == NULL) - return -ENOMEM; - - if (copy_from_user(buf, buffer, count)) { - count = -EFAULT; - goto out; - } - - buf[count] = '\0'; + buf = memdup_user_nul(buffer, count); + if (IS_ERR(buf)) + return PTR_ERR(buf); mconsole_notify(notify_socket, MCONSOLE_USER_NOTIFY, buf, count); - out: kfree(buf); return count; } |