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: [v3] usb: iowarrior: replace kmalloc with kmalloc_array From: "Gustavo A. R. Silva" Message-Id: <20180823175527.GA26370@embeddedor.com> Date: Thu, 23 Aug 2018 12:55:27 -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 ZXMgb2Y6CgoJa21hbGxvYyhhICogYiwgZ2ZwKQoKd2l0aDoKCWttYWxsb2NfYXJyYXkoYSwgYiwg Z2ZwKQoKUmV2aWV3ZWQtYnk6IEtlZXMgQ29vayA8a2Vlc2Nvb2tAY2hyb21pdW0ub3JnPgpTaWdu ZWQtb2ZmLWJ5OiBHdXN0YXZvIEEuIFIuIFNpbHZhIDxndXN0YXZvQGVtYmVkZGVkb3IuY29tPgot LS0KQ2hhbmdlcyBpbiB2MzoKIC0gVXBkYXRlIGNvbW1pdCBsb2cuCgpDaGFuZ2VzIGluIHYyOgog LSBBbGlnbiBHRlBfS0VSTkVMIHRvIG9wZW4gcGFyZW50aGVzaXMuCgogZHJpdmVycy91c2IvbWlz Yy9pb3dhcnJpb3IuYyB8IDQgKystLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwg MiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9taXNjL2lvd2Fycmlvci5j IGIvZHJpdmVycy91c2IvbWlzYy9pb3dhcnJpb3IuYwppbmRleCBjMjk5MWI4Li5iYTA1ZGQ4IDEw MDY0NAotLS0gYS9kcml2ZXJzL3VzYi9taXNjL2lvd2Fycmlvci5jCisrKyBiL2RyaXZlcnMvdXNi L21pc2MvaW93YXJyaW9yLmMKQEAgLTgwOCw4ICs4MDgsOCBAQCBzdGF0aWMgaW50IGlvd2Fycmlv cl9wcm9iZShzdHJ1Y3QgdXNiX2ludGVyZmFjZSAqaW50ZXJmYWNlLAogCQkJIGRldi0+aW50X2lu X2VuZHBvaW50LT5iSW50ZXJ2YWwpOwogCS8qIGNyZWF0ZSBhbiBpbnRlcm5hbCBidWZmZXIgZm9y IGludGVycnVwdCBkYXRhIGZyb20gdGhlIGRldmljZSAqLwogCWRldi0+cmVhZF9xdWV1ZSA9Ci0J ICAgIGttYWxsb2MoKChkZXYtPnJlcG9ydF9zaXplICsgMSkgKiBNQVhfSU5URVJSVVBUX0JVRkZF UiksCi0JCSAgICBHRlBfS0VSTkVMKTsKKwkgICAga21hbGxvY19hcnJheShkZXYtPnJlcG9ydF9z aXplICsgMSwgTUFYX0lOVEVSUlVQVF9CVUZGRVIsCisJCQkgIEdGUF9LRVJORUwpOwogCWlmICgh ZGV2LT5yZWFkX3F1ZXVlKQogCQlnb3RvIGVycm9yOwogCS8qIEdldCB0aGUgc2VyaWFsLW51bWJl ciBvZiB0aGUgY2hpcCAqLwo= 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,URIBL_BLOCKED,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 83027C4321D for ; Thu, 23 Aug 2018 17:55:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3E04C21564 for ; Thu, 23 Aug 2018 17:55:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E04C21564 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 S1727199AbeHWV0U (ORCPT ); Thu, 23 Aug 2018 17:26:20 -0400 Received: from gateway30.websitewelcome.com ([192.185.192.34]:37270 "EHLO gateway30.websitewelcome.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726573AbeHWV0U (ORCPT ); Thu, 23 Aug 2018 17:26:20 -0400 X-Greylist: delayed 760 seconds by postgrey-1.27 at vger.kernel.org; Thu, 23 Aug 2018 17:26:19 EDT Received: from cm15.websitewelcome.com (cm15.websitewelcome.com [100.42.49.9]) by gateway30.websitewelcome.com (Postfix) with ESMTP id 429803337B for ; Thu, 23 Aug 2018 12:55:29 -0500 (CDT) Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with SMTP id stpRfSNLwbXuJstpRfojY9; Thu, 23 Aug 2018 12:55:29 -0500 X-Authority-Reason: nr=8 Received: from [189.250.40.214] (port=36274 helo=embeddedor) by gator4166.hostgator.com with esmtpa (Exim 4.91) (envelope-from ) id 1fstpQ-003RFo-Bq; Thu, 23 Aug 2018 12:55:28 -0500 Date: Thu, 23 Aug 2018 12:55:27 -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 v3] usb: iowarrior: replace kmalloc with kmalloc_array Message-ID: <20180823175527.GA26370@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: 1fstpQ-003RFo-Bq X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: (embeddedor) [189.250.40.214]:36274 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 19 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) Reviewed-by: Kees Cook Signed-off-by: Gustavo A. R. Silva --- Changes in v3: - Update commit log. Changes in v2: - Align GFP_KERNEL to open parenthesis. drivers/usb/misc/iowarrior.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index c2991b8..ba05dd8 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c @@ -808,8 +808,8 @@ 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), - GFP_KERNEL); + kmalloc_array(dev->report_size + 1, MAX_INTERRUPT_BUFFER, + GFP_KERNEL); if (!dev->read_queue) goto error; /* Get the serial-number of the chip */ -- 2.7.4