From patchwork Tue Jun 27 14:43:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 113480 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8270893vqr; Tue, 27 Jun 2023 08:10:32 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6RnqiVB+wXchoGzXAXwnpVmIYBS9TITq0xnTgkBmOPh/6OklFBXpkQa56Ccf9nlXFgfbct X-Received: by 2002:a17:903:2342:b0:1ad:f138:b2f6 with SMTP id c2-20020a170903234200b001adf138b2f6mr13145396plh.16.1687878632274; Tue, 27 Jun 2023 08:10:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687878632; cv=none; d=google.com; s=arc-20160816; b=Kt/aa5PvTszcqr3O91KkjY51gNDmF4xqTew7vBGm74FaQ4NUP3HzuyRM0N/5bHZqQM x+jXLmxv5XFYjoRhIf62+KAoj08fm4By0HPAnPXSV+tLfbt07U+X5nlMFkeY61jmEo4s 7nT6ZqvNftY5peV0lmh1i/Ahjv8VVSbJQQsTRyhAcGm2sNAb6Hut94JmkYlRtiiww39c ExGmmnGk/H/GkN5P+YaXp2akv7ptRtL5e2BqViGzbTPji4eMKuiKD43KJPczmEOohibz xJb+S+w+Hjk2ZYZEKdBZ4C/m+C22ll8PzYE2ZYXalYrQp3HpdHhpAO0q304IFJyRklz2 BiCg== 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=9Uv1/3sMOK5WjHkwYctB4Lm1eQ43JKgqddzae9sDlAM=; fh=gLlWIf+O21ga8Sv1wgcsqEfUZdKyvaDY+SrmHgYl8iY=; b=tlFeV9pmvkzNL3OjuRXn5JfvT1mfRQ7g2lVaYS7LIVGBqRQVCdSWzLm+fSPDQrgARS NkG7O6EtfHg4iotUFU6qQ1osoBiidjmTUs/WyVqjSl/fqLyN2c8Cn041QkZCCrOfgHE0 UczWJhJL+lDTdvnxRaK7RyJyuglMgwqR4CtdOtME452qnjFpp9PHoDDAJQdct3SMyOWa o73WZ8CWrjem2lzoCGLNxeOK+A/qkRdf5eXp6DUrkfhPQ5Rr3FOLkbw0F9ojmJi9Mcb7 2ZNgk8ruSTVcDyk29jZ2oiHHWBspQ8h6pqFUDdCPwkyiVeHNAe2TgQxvYYbcoj3v7Ufd l1WQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=jFLOVyOS; 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 q4-20020a170902f34400b001b8096934c4si3568348ple.256.2023.06.27.08.10.18; Tue, 27 Jun 2023 08:10:32 -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=jFLOVyOS; 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 S231975AbjF0Opp (ORCPT + 99 others); Tue, 27 Jun 2023 10:45:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232187AbjF0OpJ (ORCPT ); Tue, 27 Jun 2023 10:45:09 -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 19CB8FA; Tue, 27 Jun 2023 07:44:46 -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=9Uv1/3sMOK5WjHkwYctB4Lm1eQ43JKgqddzae9sDlAM=; b=jFLOVyOSfjgRFE1+axxBVSiw9elyDAC/qWd/c9+ZPqESIpXQlrmrruqO a88dlv1GtRFSBKP5PALtKNdYjjXSm2eb2PWOcLxcnVjyF4pP4+8m+6i68 yjU33agmfZ2rT3nr7Xxmjy1sw1hZZ8YTTnAmp2+CU9UGypaoT6x8oCkIg A=; 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="114936321" 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:51 +0200 From: Julia Lawall To: Jeroen de Borst Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org, Praveen Kaligineedi , Shailend Chand , "David S. Miller" , Eric Dumazet , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 04/24] gve: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:19 +0200 Message-Id: <20230627144339.144478-5-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 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769869024380645221?= X-GMAIL-MSGID: =?utf-8?q?1769869024380645221?= Use vmalloc_array and vcalloc to protect against multiplication overflows. The changes were done using the following Coccinelle semantic patch: // @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) ) // Signed-off-by: Julia Lawall --- 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/google/gve/gve_tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -u -p a/drivers/net/ethernet/google/gve/gve_tx.c b/drivers/net/ethernet/google/gve/gve_tx.c --- a/drivers/net/ethernet/google/gve/gve_tx.c +++ b/drivers/net/ethernet/google/gve/gve_tx.c @@ -248,7 +248,7 @@ static int gve_tx_alloc_ring(struct gve_ tx->mask = slots - 1; /* alloc metadata */ - tx->info = vzalloc(sizeof(*tx->info) * slots); + tx->info = vcalloc(slots, sizeof(*tx->info)); if (!tx->info) return -ENOMEM;