diff options
| author |   Saurabh Sengar <saurabh.truth@gmail.com> | 2015-10-28 11:56:44 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-06 23:27:46 -0800 |
| commit | 1051937d465665e3360ea7d9a3d2adfd86f47dd4 (patch) | |
| tree | 6d8b13803702db52f2e0ba74e3e83523e94ab424 /drivers/tty/vt/keyboard.c | |
| parent | drivers/tty: make ehv_bytechan.c explicitly non-modular (diff) | |
| download | linux-dev-1051937d465665e3360ea7d9a3d2adfd86f47dd4.tar.xz linux-dev-1051937d465665e3360ea7d9a3d2adfd86f47dd4.zip | |
tty/vt/keyboard: use memdup_user to simplify code
use memdup_user rather than duplicating implementation.
found by coccinelle
Signed-off-by: Saurabh Sengar <saurabh.truth@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt/keyboard.c')
| -rw-r--r-- | drivers/tty/vt/keyboard.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index 6f0336fff501..f973bfce5d08 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c @@ -1706,16 +1706,12 @@ int vt_do_diacrit(unsigned int cmd, void __user *udp, int perm) return -EINVAL; if (ct) { - dia = kmalloc(sizeof(struct kbdiacr) * ct, - GFP_KERNEL); - if (!dia) - return -ENOMEM; - if (copy_from_user(dia, a->kbdiacr, - sizeof(struct kbdiacr) * ct)) { - kfree(dia); - return -EFAULT; - } + dia = memdup_user(a->kbdiacr, + sizeof(struct kbdiacr) * ct); + if (IS_ERR(dia)) + return PTR_ERR(dia); + } spin_lock_irqsave(&kbd_event_lock, flags); |