From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755414AbbJ1G0x (ORCPT ); Wed, 28 Oct 2015 02:26:53 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:32791 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755302AbbJ1G0w (ORCPT ); Wed, 28 Oct 2015 02:26:52 -0400 From: Saurabh Sengar To: gregkh@linuxfoundation.org, jslaby@suse.com, linux-kernel@vger.kernel.org Cc: Saurabh Sengar Subject: [PATCH] tty/vt/keyboard: use memdup_user to simplify code Date: Wed, 28 Oct 2015 11:56:44 +0530 Message-Id: <1446013604-15017-1-git-send-email-saurabh.truth@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org use memdup_user rather than duplicating implementation. found by coccinelle Signed-off-by: Saurabh Sengar --- drivers/tty/vt/keyboard.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index 6f0336f..f973bfc 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); -- 1.9.1