Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1952098AbdD2Bxq (ORCPT ); Fri, 28 Apr 2017 21:53:46 -0400 Received: from smtprelay0166.hostedemail.com ([216.40.44.166]:58772 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1424848AbdD2Bxi (ORCPT ); Fri, 28 Apr 2017 21:53:38 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::::::,RULES_HIT:41:355:379:541:599:960:966:973:988:989:1260:1277:1311:1313:1314:1345:1359:1373:1437:1515:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2559:2562:2828:3138:3139:3140:3141:3142:3352:3622:3865:3866:3867:3871:4321:4385:5007:10004:10400:10848:11026:11232:11658:11914:12043:12048:12296:12740:12760:12895:13069:13161:13229:13311:13357:13439:14181:14659:14721:21080:30012:30054:30070:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:1,LUA_SUMMARY:none X-HE-Tag: lock22_767517f3e2c24 X-Filterd-Recvd-Size: 2281 Message-ID: <1493430812.1873.26.camel@perches.com> Subject: Re: [PATCH] staging: comedi: use memdup_user From: Joe Perches To: Geliang Tang , Ian Abbott , H Hartley Sweeten , Greg Kroah-Hartman , Arnd Bergmann Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Date: Fri, 28 Apr 2017 18:53:32 -0700 In-Reply-To: <6d37f80c3c8cb4572469e30dd5ebae1388b67c97.1493382684.git.geliangtang@gmail.com> References: <4db2a0ba17dc68d7bcfbd7d47b0eb22ad9a220c2.1493381463.git.geliangtang@gmail.com> <6d37f80c3c8cb4572469e30dd5ebae1388b67c97.1493382684.git.geliangtang@gmail.com> Content-Type: text/plain; charset="ISO-8859-1" X-Mailer: Evolution 3.22.6-1ubuntu1 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1193 Lines: 39 On Sat, 2017-04-29 at 09:45 +0800, Geliang Tang wrote: > Use memdup_user() helper instead of open-coding to simplify the code. While I doubt this is a problem, this loses the multiplication overflow check for sizeof(*insns) * insnlist.n_isns > diff --git 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++) {