diff options
author | Muhammad Falak R Wani <falakreyaz@gmail.com> | 2016-05-20 08:23:28 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 13:40:33 -0400 |
commit | 9b6519009dbe2b361a73284ea0fd2e9b86aeef4d (patch) | |
tree | bdadbfcd6ef5a9ad21f685804b67b19d64463672 /drivers/tty/vt | |
parent | a7cfaf165ed0f0b1e5e8636f9f28843b2b90139a (diff) |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r-- | drivers/tty/vt/keyboard.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index cd08c103eb47..89a7ab007ff4 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) | |||
1745 | return -EINVAL; | 1745 | return -EINVAL; |
1746 | 1746 | ||
1747 | if (ct) { | 1747 | if (ct) { |
1748 | buf = kmalloc(ct * sizeof(struct kbdiacruc), | 1748 | buf = memdup_user(a->kbdiacruc, |
1749 | GFP_KERNEL); | 1749 | ct * sizeof(struct kbdiacruc)); |
1750 | if (buf == NULL) | 1750 | if (IS_ERR(buf)) |
1751 | return -ENOMEM; | 1751 | return PTR_ERR(buf); |
1752 | |||
1753 | if (copy_from_user(buf, a->kbdiacruc, | ||
1754 | ct * sizeof(struct kbdiacruc))) { | ||
1755 | kfree(buf); | ||
1756 | return -EFAULT; | ||
1757 | } | ||
1758 | } | 1752 | } |
1759 | spin_lock_irqsave(&kbd_event_lock, flags); | 1753 | spin_lock_irqsave(&kbd_event_lock, flags); |
1760 | if (ct) | 1754 | if (ct) |