Message ID | 20230627144339.144478-8-Julia.Lawall@inria.fr |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8271379vqr; Tue, 27 Jun 2023 08:11:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7AMMaSPhlM9AVD7ORflAH6cPCQHL/8cuemKLqTtWIap7IvOS1MvrjRpIDQ7I/mFeAQ/qO5 X-Received: by 2002:a05:6a00:809:b0:66a:4a45:e017 with SMTP id m9-20020a056a00080900b0066a4a45e017mr18767145pfk.20.1687878665304; Tue, 27 Jun 2023 08:11:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687878665; cv=none; d=google.com; s=arc-20160816; b=AVfn2BezGCcKmcuVgOOzF1YcCjqk5HD6uFXi2xqS6r79kPmUNRBWHaCifoCUX5vUoe aApWP6Gh3RH7arbgKIHuCYkmQYUXPIie2a7HPP3X9vrrb4g3DEZV+C874l4UGOgBeFvi +jc19XbF0xAYVkQm8cVSQfFRIYCBqhYI1ZiHkR/n72dNwG0UAVFKws0mW7nt8hfwNDhU qanTuzilaXJhpefZLUOChkAzrPDN80ebH8QMWFHT3B3GjTa22CgnM3Y4/+aentAIkq8I ZsuUye0va5EivolSzUOfqNPaYdKCjuxrcIEpX0z3jQNDBEoF+HWPWj6PYeys3TxGuKqB hCtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=1tnGFewg2jR0iMP418C+xvB2RAhFZotb9IdUilMQXSs=; fh=plZTqtxM767CadgDJEMIJwoLy2otFn0Mka3ObEmb46A=; b=Z4CERN84DQTuqFQq8OdwRywvbN0R0wbcemwQwgzphj4TnHUkVUcy0rhnKHWKjJV3c1 1rY2TlPqQ/ZY0A7BGJY7UULUaqGWUwPzdMl9oxRRC88HK1BAgANNpfICsMoaKDrr7r+3 3RdMGyvyYCJUir69NU8wBG7LobEiSrGlezUE9dRdSSztu0sc1Femw36Iw3Mz0S4acLoL 1DQbF7Y1qhuKZ/UbxjvOS+pgXNcYeMyWXfqRlrrB2fDNjF/RKQVSx0JOErzAsoG9eG7i 2h9jdC0SBo1oZhgwMlJMlgB5PSBPwrnHU6ABX/3/A5hGo8wDhRZuBPGbEf4iFvkeBqXd 8j+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=t3l9LnZl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=inria.fr Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g17-20020aa79f11000000b00678b9f5aa99si3774114pfr.66.2023.06.27.08.10.51; Tue, 27 Jun 2023 08:11:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=t3l9LnZl; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=inria.fr Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232043AbjF0OqD (ORCPT <rfc822;nicolai.engesland@gmail.com> + 99 others); Tue, 27 Jun 2023 10:46:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232285AbjF0OpU (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 27 Jun 2023 10:45:20 -0400 Received: from mail2-relais-roc.national.inria.fr (mail2-relais-roc.national.inria.fr [192.134.164.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36E2F2D4A; Tue, 27 Jun 2023 07:45:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inria.fr; s=dc; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1tnGFewg2jR0iMP418C+xvB2RAhFZotb9IdUilMQXSs=; b=t3l9LnZl8E31zljbSHPAQNc818zyETs8RMV762Np9tk93rnpPSWcxAce TZQi4X52h0ikF+kYiol3tCeBK6JJsOV2esoYvTmI3RCoGk5b/TA/lljL0 SuoaPWdfYHhQXBVqBGGSUeEtEQFPzrf/VtcqN8eLC8l+glhRTE6hvHivX I=; Authentication-Results: mail2-relais-roc.national.inria.fr; dkim=none (message not signed) header.i=none; spf=SoftFail smtp.mailfrom=Julia.Lawall@inria.fr; dmarc=fail (p=none dis=none) d=inria.fr X-IronPort-AV: E=Sophos;i="6.01,162,1684792800"; d="scan'208";a="114936326" Received: from i80.paris.inria.fr (HELO i80.paris.inria.fr.) ([128.93.90.48]) by mail2-relais-roc.national.inria.fr with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2023 16:43:52 +0200 From: Julia Lawall <Julia.Lawall@inria.fr> To: Satish Kharat <satishkh@cisco.com> Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org, Sesidhar Baddela <sebaddel@cisco.com>, Karan Tilak Kumar <kartilak@cisco.com>, "James E.J. Bottomley" <jejb@linux.ibm.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 07/24] scsi: fnic: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:22 +0200 Message-Id: <20230627144339.144478-8-Julia.Lawall@inria.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230627144339.144478-1-Julia.Lawall@inria.fr> References: <20230627144339.144478-1-Julia.Lawall@inria.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769869059456976821?= X-GMAIL-MSGID: =?utf-8?q?1769869059456976821?= |
Series |
use vmalloc_array and vcalloc
|
|
Commit Message
Julia Lawall
June 27, 2023, 2:43 p.m. UTC
Use vmalloc_array and vcalloc to protect against
multiplication overflows.
The changes were done using the following Coccinelle
semantic patch:
// <smpl>
@initialize:ocaml@
@@
let rename alloc =
match alloc with
"vmalloc" -> "vmalloc_array"
| "vzalloc" -> "vcalloc"
| _ -> failwith "unknown"
@@
size_t e1,e2;
constant C1, C2;
expression E1, E2, COUNT, x1, x2, x3;
typedef u8;
typedef __u8;
type t = {u8,__u8,char,unsigned char};
identifier alloc = {vmalloc,vzalloc};
fresh identifier realloc = script:ocaml(alloc) { rename alloc };
@@
(
alloc(x1*x2*x3)
|
alloc(C1 * C2)
|
alloc((sizeof(t)) * (COUNT), ...)
|
- alloc((e1) * (e2))
+ realloc(e1, e2)
|
- alloc((e1) * (COUNT))
+ realloc(COUNT, e1)
|
- alloc((E1) * (E2))
+ realloc(E1, E2)
)
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>
---
v2: Use vmalloc_array and vcalloc instead of array_size.
This also leaves a multiplication of a constant by a sizeof
as is. Two patches are thus dropped from the series.
drivers/scsi/fnic/fnic_trace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -u -p a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c @@ -465,7 +465,7 @@ int fnic_trace_buf_init(void) fnic_max_trace_entries = (trace_max_pages * PAGE_SIZE)/ FNIC_ENTRY_SIZE_BYTES; - fnic_trace_buf_p = (unsigned long)vzalloc(trace_max_pages * PAGE_SIZE); + fnic_trace_buf_p = (unsigned long)vcalloc(trace_max_pages, PAGE_SIZE); if (!fnic_trace_buf_p) { printk(KERN_ERR PFX "Failed to allocate memory " "for fnic_trace_buf_p\n");