diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-24 00:06:05 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-04 10:26:58 -0500 |
commit | 16e5c1fc36040e592128a164499bc25eb138a80f (patch) | |
tree | a080bd2eea306d5815c5a9eefb46180e2bedffb2 /drivers/s390 | |
parent | 7e935c7ca1e6c398f11edac5beabfc4348e3b3a4 (diff) |
convert a bunch of open-coded instances of memdup_user_nul()
A _lot_ of ->write() instances were open-coding it; some are
converted to memdup_user_nul(), a lot more remain...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/char/vmcp.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c index 0fdedadff7bc..2a67b496a9e2 100644 --- a/drivers/s390/char/vmcp.c +++ b/drivers/s390/char/vmcp.c | |||
@@ -88,14 +88,9 @@ vmcp_write(struct file *file, const char __user *buff, size_t count, | |||
88 | 88 | ||
89 | if (count > 240) | 89 | if (count > 240) |
90 | return -EINVAL; | 90 | return -EINVAL; |
91 | cmd = kmalloc(count + 1, GFP_KERNEL); | 91 | cmd = memdup_user_nul(buff, count); |
92 | if (!cmd) | 92 | if (IS_ERR(cmd)) |
93 | return -ENOMEM; | 93 | return PTR_ERR(cmd); |
94 | if (copy_from_user(cmd, buff, count)) { | ||
95 | kfree(cmd); | ||
96 | return -EFAULT; | ||
97 | } | ||
98 | cmd[count] = '\0'; | ||
99 | session = file->private_data; | 94 | session = file->private_data; |
100 | if (mutex_lock_interruptible(&session->mutex)) { | 95 | if (mutex_lock_interruptible(&session->mutex)) { |
101 | kfree(cmd); | 96 | kfree(cmd); |