summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMuhammad Falak R Wani <falakreyaz@gmail.com>2016-07-21 00:53:18 (GMT)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-07-21 00:57:30 (GMT)
commit0097ff3d5dad1f76c5e1099d849d52509500708c (patch)
tree8b0e6655a0bd9b907a8785d683b1f556af8907b3 /drivers
parentc1d7b7c1817aceaa93e5f255fc0ea23f327bcd40 (diff)
downloadlinux-0097ff3d5dad1f76c5e1099d849d52509500708c.tar.xz
Input: tty/vt/keyboard - use memdup_user()
Use memdup_user to duplicate a memory region from user-space to kernel-space, instead of open coding using kmalloc & copy_from_user. Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/tty/vt/keyboard.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index f973bfc..698ea43 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -1745,16 +1745,10 @@ int vt_do_diacrit(unsigned int cmd, void __user *udp, int perm)
return -EINVAL;
if (ct) {
- buf = kmalloc(ct * sizeof(struct kbdiacruc),
- GFP_KERNEL);
- if (buf == NULL)
- return -ENOMEM;
-
- if (copy_from_user(buf, a->kbdiacruc,
- ct * sizeof(struct kbdiacruc))) {
- kfree(buf);
- return -EFAULT;
- }
+ buf = memdup_user(a->kbdiacruc,
+ ct * sizeof(struct kbdiacruc));
+ if (IS_ERR(buf))
+ return PTR_ERR(buf);
}
spin_lock_irqsave(&kbd_event_lock, flags);
if (ct)