Message ID | 20230627144339.144478-12-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 k13csp8266604vqr; Tue, 27 Jun 2023 08:05:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4KhOSKU69xSiegKS/L2C+AWfNjXmI4hkbq57o3R+t/B4iA8D77dzPmiY6dO3MAT76ZSydk X-Received: by 2002:a05:6a20:6a1e:b0:119:5af7:7cef with SMTP id p30-20020a056a206a1e00b001195af77cefmr24381812pzk.56.1687878355623; Tue, 27 Jun 2023 08:05:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687878355; cv=none; d=google.com; s=arc-20160816; b=ENR+r0Vsi2H25FXdE+Q2QKofO8fDZoH8c8ClVsYiYCzzlGuRdTyPjGGjjjm/TmNcc4 gF0hBxBBzCuexAlshlOhDJ5kO71aLsjQXPdzaAgJRO7bNQ265tVcDN+/LnA+T91n3rwz 6Q+2ip4BivcCyueyFYN8LkttKmyoHdhQhqnn4YYXkEYihtaI/lWKi9etOrRMdnZyYvL/ CMjrNMtMhrTPVnj+0Zy0ybAo8TLARCAOB8+aQFZzYiPvg5tyWczBGvg0fLByrK+MVS98 SV5sEsEVWBhpltlqhwYrItI/VQ5y6X+JlQbZdwgTsryKbsRJghgkmi7hrBoLv1Y42lq/ URdg== 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=YkMaWxPDeWDuwTCFlcObNyyTEnApvX0G2Mje4w+fbtU=; fh=8UFpjDLzrQW0pVp2Tsq8Gqt5uE7DW+OTepjfwpBuFE4=; b=zS1DwawNe4FLhsKKzP7GBdvvYeBQLodBenLx7HK4LITkCJY6p3gD8DMydjLGhGix0c xPf6ZKP6kXdkNFkPpSU0DhP+qhqX5q7RHpkRG+3aWUUdxaM03lHHFWEMfhcV6HSRv1Qu HuaSBGwNKEgKQkfagy0BAJMBtY6uZAXJoNRFK2zDFL8BQUdvpGMfMPTAe7u1mhtWvovu LYzQDOel3RS0/MM/KPzM/c3jFNWFeD7emCh1Kp0gb4FEfe+rXf57f/9V7UoS+jY5Bxh8 E0DAdRTH/gWxmRPzGps8DIJeozLC0C8U1IxJX5WRgQyZ1OW8f0peT+xbkxMwfX6vcCmS 34wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=lPX+7nYe; 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 z11-20020a6552cb000000b0054fe9faf30bsi7326830pgp.562.2023.06.27.08.05.26; Tue, 27 Jun 2023 08:05:55 -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=lPX+7nYe; 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 S232115AbjF0OqW (ORCPT <rfc822;nicolai.engesland@gmail.com> + 99 others); Tue, 27 Jun 2023 10:46:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231368AbjF0OpZ (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 27 Jun 2023 10:45:25 -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 950363584; Tue, 27 Jun 2023 07:45:14 -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=YkMaWxPDeWDuwTCFlcObNyyTEnApvX0G2Mje4w+fbtU=; b=lPX+7nYe2ZOHxz0U8/dk+DhD+wLKHgnLzJkbNkPJLIr3SePpUVgi6Skq Q+SJxt7nzTKIib54VI3UqWgjp2Ujv3MeddOvxrKuRUlHb7MKhVf12NvxB vTBapNghDQqBLKxRS6/K9ORo/2D4ZInye6vH9tidIFBk5UrzVe7gTYA8t w=; 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="114936332" 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: Shannon Nelson <shannon.nelson@amd.com> Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org, Brett Creeley <brett.creeley@amd.com>, drivers@pensando.io, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 11/24] ionic: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:26 +0200 Message-Id: <20230627144339.144478-12-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?1769868734777605474?= X-GMAIL-MSGID: =?utf-8?q?1769868734777605474?= |
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/net/ethernet/pensando/ionic/ionic_lif.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -u -p a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c @@ -561,7 +561,7 @@ static int ionic_qcq_alloc(struct ionic_ new->q.dev = dev; new->flags = flags; - new->q.info = vzalloc(num_descs * sizeof(*new->q.info)); + new->q.info = vcalloc(num_descs, sizeof(*new->q.info)); if (!new->q.info) { netdev_err(lif->netdev, "Cannot allocate queue info\n"); err = -ENOMEM; @@ -582,7 +582,7 @@ static int ionic_qcq_alloc(struct ionic_ if (err) goto err_out; - new->cq.info = vzalloc(num_descs * sizeof(*new->cq.info)); + new->cq.info = vcalloc(num_descs, sizeof(*new->cq.info)); if (!new->cq.info) { netdev_err(lif->netdev, "Cannot allocate completion queue info\n"); err = -ENOMEM;