From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: usb: iowarrior: replace kmalloc with kmalloc_array From: "Gustavo A. R. Silva" Message-Id: <20180823173125.GA24762@embeddedor.com> Date: Thu, 23 Aug 2018 12:31:25 -0500 To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , "Gustavo A. R. Silva" List-ID: QSBjb21tb24gZmxhdyBpbiB0aGUga2VybmVsIGlzIGludGVnZXIgb3ZlcmZsb3cgZHVyaW5nIG1l bW9yeSBhbGxvY2F0aW9uCnNpemUgY2FsY3VsYXRpb25zLiBJbiBhbiBlZmZvcnQgdG8gcmVkdWNl IHRoZSBmcmVxdWVuY3kgb2YgdGhlc2UgYnVncywKa21hbGxvY19hcnJheSB3YXMgaW1wbGVtZW50 ZWQsIHdoaWNoIGFsbG9jYXRlcyBtZW1vcnkgZm9yIGFuIGFycmF5LAp3aGlsZSBhdCB0aGUgc2Ft ZSB0aW1lIGRldGVjdHMgaW50ZWdlciBvdmVyZmxvdy4KClRoaXMgcGF0Y2ggcmVwbGFjZXMgY2Fz ZXMgb2Y6CgprbWFsbG9jKGEgKiBiLCBnZnApCgp3aXRoOgoJa21hbGxvY19hcnJheShhICogYiwg Z2ZwKQoKU2lnbmVkLW9mZi1ieTogR3VzdGF2byBBLiBSLiBTaWx2YSA8Z3VzdGF2b0BlbWJlZGRl ZG9yLmNvbT4KLS0tCiBkcml2ZXJzL3VzYi9taXNjL2lvd2Fycmlvci5jIHwgMiArLQogMSBmaWxl IGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy91c2IvbWlzYy9pb3dhcnJpb3IuYyBiL2RyaXZlcnMvdXNiL21pc2MvaW93YXJyaW9yLmMK aW5kZXggYzI5OTFiOC4uN2EyMjQwMCAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvbWlzYy9pb3dh cnJpb3IuYworKysgYi9kcml2ZXJzL3VzYi9taXNjL2lvd2Fycmlvci5jCkBAIC04MDgsNyArODA4 LDcgQEAgc3RhdGljIGludCBpb3dhcnJpb3JfcHJvYmUoc3RydWN0IHVzYl9pbnRlcmZhY2UgKmlu dGVyZmFjZSwKIAkJCSBkZXYtPmludF9pbl9lbmRwb2ludC0+YkludGVydmFsKTsKIAkvKiBjcmVh dGUgYW4gaW50ZXJuYWwgYnVmZmVyIGZvciBpbnRlcnJ1cHQgZGF0YSBmcm9tIHRoZSBkZXZpY2Ug Ki8KIAlkZXYtPnJlYWRfcXVldWUgPQotCSAgICBrbWFsbG9jKCgoZGV2LT5yZXBvcnRfc2l6ZSAr IDEpICogTUFYX0lOVEVSUlVQVF9CVUZGRVIpLAorCSAgICBrbWFsbG9jX2FycmF5KGRldi0+cmVw b3J0X3NpemUgKyAxLCBNQVhfSU5URVJSVVBUX0JVRkZFUiwKIAkJICAgIEdGUF9LRVJORUwpOwog CWlmICghZGV2LT5yZWFkX3F1ZXVlKQogCQlnb3RvIGVycm9yOwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D946DC4321D for ; Thu, 23 Aug 2018 17:54:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 954F22152D for ; Thu, 23 Aug 2018 17:54:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 954F22152D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=embeddedor.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727379AbeHWVYx (ORCPT ); Thu, 23 Aug 2018 17:24:53 -0400 Received: from gateway20.websitewelcome.com ([192.185.4.169]:16109 "EHLO gateway20.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726297AbeHWVYx (ORCPT ); Thu, 23 Aug 2018 17:24:53 -0400 X-Greylist: delayed 1346 seconds by postgrey-1.27 at vger.kernel.org; Thu, 23 Aug 2018 17:24:53 EDT Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway20.websitewelcome.com (Postfix) with ESMTP id 391BD40114410 for ; Thu, 23 Aug 2018 12:31:43 -0500 (CDT) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id stSDfOYtYBcCXstSLfuFuG; Thu, 23 Aug 2018 12:31:42 -0500 X-Authority-Reason: nr=8 Received: from [189.250.40.214] (port=35896 helo=embeddedor) by gator4166.hostgator.com with esmtpa (Exim 4.91) (envelope-from ) id 1fstSD-003AEs-7O; Thu, 23 Aug 2018 12:31:29 -0500 Date: Thu, 23 Aug 2018 12:31:25 -0500 From: "Gustavo A. R. Silva" To: Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , "Gustavo A. R. Silva" Subject: [PATCH] usb: iowarrior: replace kmalloc with kmalloc_array Message-ID: <20180823173125.GA24762@embeddedor.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 189.250.40.214 X-Source-L: No X-Exim-ID: 1fstSD-003AEs-7O X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.250.40.214]:35896 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 3 X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A common flaw in the kernel is integer overflow during memory allocation size calculations. In an effort to reduce the frequency of these bugs, kmalloc_array was implemented, which allocates memory for an array, while at the same time detects integer overflow. This patch replaces cases of: kmalloc(a * b, gfp) with: kmalloc_array(a * b, gfp) Signed-off-by: Gustavo A. R. Silva --- drivers/usb/misc/iowarrior.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index c2991b8..7a22400 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c @@ -808,7 +808,7 @@ static int iowarrior_probe(struct usb_interface *interface, dev->int_in_endpoint->bInterval); /* create an internal buffer for interrupt data from the device */ dev->read_queue = - kmalloc(((dev->report_size + 1) * MAX_INTERRUPT_BUFFER), + kmalloc_array(dev->report_size + 1, MAX_INTERRUPT_BUFFER, GFP_KERNEL); if (!dev->read_queue) goto error; -- 2.7.4