aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeliang Tang2017-05-06 23:40:19 +0800
committerAndy Shevchenko2017-05-15 12:06:10 +0300
commitf0ee1a6d319df56e49ca8308c5e9b69a9017f69d (patch)
tree057a95e082448600b11c6d807a59608cbc9dccb9
parent7f363145992cebf4ea760447f1cfdf6f81459683 (diff)
platform/x86: toshiba_acpi: use memdup_user_nul
Use memdup_user_nul() helper instead of open-coding to simplify the code. Signed-off-by: Geliang Tang <geliangtang@gmail.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-rw-r--r--drivers/platform/x86/toshiba_acpi.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index d0daf75cbed1..88f9f79a7cf6 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -1502,14 +1502,9 @@ static ssize_t video_proc_write(struct file *file, const char __user *buf,
int ret;
u32 video_out;
- cmd = kmalloc(count + 1, GFP_KERNEL);
- if (!cmd)
- return -ENOMEM;
- if (copy_from_user(cmd, buf, count)) {
- kfree(cmd);
- return -EFAULT;
- }
- cmd[count] = '\0';
+ cmd = memdup_user_nul(buf, count);
+ if (IS_ERR(cmd))
+ return PTR_ERR(cmd);
buffer = cmd;