Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S376309AbdD2Br0 (ORCPT ); Fri, 28 Apr 2017 21:47:26 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:35905 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1952302AbdD2BrR (ORCPT ); Fri, 28 Apr 2017 21:47:17 -0400 From: Geliang Tang To: Ian Abbott , H Hartley Sweeten , Greg Kroah-Hartman , Arnd Bergmann Cc: Geliang Tang , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: comedi: use memdup_user Date: Sat, 29 Apr 2017 09:45:18 +0800 Message-Id: <6d37f80c3c8cb4572469e30dd5ebae1388b67c97.1493382684.git.geliangtang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <4db2a0ba17dc68d7bcfbd7d47b0eb22ad9a220c2.1493381463.git.geliangtang@gmail.com> References: <4db2a0ba17dc68d7bcfbd7d47b0eb22ad9a220c2.1493381463.git.geliangtang@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1254 Lines: 43 Use memdup_user() helper instead of open-coding to simplify the code. Signed-off-by: Geliang Tang --- drivers/staging/comedi/comedi_fops.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index f191c2a..4797c8f 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -1450,22 +1450,14 @@ static int do_insnlist_ioctl(struct comedi_device *dev, return -EFAULT; data = kmalloc_array(MAX_SAMPLES, sizeof(unsigned int), GFP_KERNEL); - if (!data) { - ret = -ENOMEM; - goto error; - } - - insns = kcalloc(insnlist.n_insns, sizeof(*insns), GFP_KERNEL); - if (!insns) { - ret = -ENOMEM; - goto error; - } + if (!data) + return -ENOMEM; - if (copy_from_user(insns, insnlist.insns, - sizeof(*insns) * insnlist.n_insns)) { - dev_dbg(dev->class_dev, "copy_from_user failed\n"); - ret = -EFAULT; - goto error; + insns = memdup_user(insnlist.insns, sizeof(*insns) * insnlist.n_insns); + if (IS_ERR(insns)) { + dev_dbg(dev->class_dev, "memdup_user failed\n"); + kfree(data); + return PTR_ERR(insns); } for (i = 0; i < insnlist.n_insns; i++) { -- 2.9.3