From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756110AbcETMW1 (ORCPT ); Fri, 20 May 2016 08:22:27 -0400 Received: from mail-pa0-f68.google.com ([209.85.220.68]:33472 "EHLO mail-pa0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755291AbcETMWZ (ORCPT ); Fri, 20 May 2016 08:22:25 -0400 From: Muhammad Falak R Wani To: Heiko Carstens Cc: Martin Schwidefsky , Jan Kara , linux-s390@vger.kernel.org (open list:S390), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] ks390/keyboard: use memdup_user(). Date: Fri, 20 May 2016 17:52:16 +0530 Message-Id: <1463746939-23892-1-git-send-email-falakreyaz@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- drivers/s390/char/keyboard.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c index ef04a9f..2955983 100644 --- a/drivers/s390/char/keyboard.c +++ b/drivers/s390/char/keyboard.c @@ -438,13 +438,9 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs, return -EFAULT; if (len > sizeof(u_kbs->kb_string)) return -EINVAL; - p = kmalloc(len, GFP_KERNEL); - if (!p) - return -ENOMEM; - if (copy_from_user(p, u_kbs->kb_string, len)) { - kfree(p); - return -EFAULT; - } + p = memdup_user(u_kbs->kb_string, len); + if (IS_ERR(p)) + return PTR_ERR(p); /* * Make sure the string is terminated by 0. User could have * modified it between us running strnlen_user() and copying it. -- 1.9.1