diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-07-25 21:49:36 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-25 21:49:36 +0200 |
| commit | c84d53051fcb4f3d14d5a245e1d7ee8512bcb199 (patch) | |
| tree | 30f7f845afc8e0428c1fbb1bc93f52b120d40661 /drivers/platform/x86/thinkpad_acpi.c | |
| parent | 9a71df495c3d29dab596bb590e73fd8b20106e2d (diff) | |
| parent | ba47d845d715a010f7b51f6f89bae32845e6acb7 (diff) | |
| download | kernel_replicant_linux-c84d53051fcb4f3d14d5a245e1d7ee8512bcb199.tar.gz kernel_replicant_linux-c84d53051fcb4f3d14d5a245e1d7ee8512bcb199.tar.bz2 kernel_replicant_linux-c84d53051fcb4f3d14d5a245e1d7ee8512bcb199.zip | |
Merge tag 'v5.8-rc6' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/platform/x86/thinkpad_acpi.c')
| -rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index ff7f0a4f2475..0f6fceda5fc0 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -885,11 +885,19 @@ static ssize_t dispatch_proc_write(struct file *file, if (!ibm || !ibm->write) return -EINVAL; + if (count > PAGE_SIZE - 1) + return -EINVAL; + + kernbuf = kmalloc(count + 1, GFP_KERNEL); + if (!kernbuf) + return -ENOMEM; - kernbuf = strndup_user(userbuf, PAGE_SIZE); - if (IS_ERR(kernbuf)) - return PTR_ERR(kernbuf); + if (copy_from_user(kernbuf, userbuf, count)) { + kfree(kernbuf); + return -EFAULT; + } + kernbuf[count] = 0; ret = ibm->write(kernbuf); if (ret == 0) ret = count; |