From patchwork Tue Jun 27 14:43:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 113467 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8264834vqr; Tue, 27 Jun 2023 08:04:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ45fblMISnDX2qHU0s+MF2fbLFJC7umpxYLNnv5/bY8TEesPJg1swWxx9Q+K97elmCKN8S0 X-Received: by 2002:a17:902:ead5:b0:1b8:2a96:6471 with SMTP id p21-20020a170902ead500b001b82a966471mr1011234pld.46.1687878247067; Tue, 27 Jun 2023 08:04:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687878247; cv=none; d=google.com; s=arc-20160816; b=GiLSSNtSeRJEoF9p9dNX6lwZNz0hMNMF8lj7Auq0gI2Pj06eyQOtGnmRhSzU9dpuAw arhrOZUGK3hx8+DL6zX36iicQJgMyVnwRpLY119VWkVvsUu/JQcGJUXy+ECb35Cqcjpf s5v86Y4WoO6dqKnXH6XJ8TY+GoAd3Cz0Ts9cpoT7zMWN+0bOqv9IUkp/dQKE7zI+U/jX CJIWtUXRX474Wf6iwkqmtQmXLzbU+Gfir6yfnAgGRA65iD89vmdYvD672uNjhBDa80+O b/Wopni/X8upZMXB9vhf/mWeXuNFdSsRy+xeb6DepM3mrqni3G7UcQaiI0bpsu9sxAdi bmEQ== 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=fzSlg9RNv3R+3q3XKuXY+6o6TuoQBOkN0UNS+oRdi0g=; fh=uYoBPU9uLNfv2jsr/TuWKYWHj5pvtXo1hvKYeRwcxt4=; b=m0JDFAFY5r978vasyU6Ev8vK2huUBwxBpGldtjWBi3ToFPd9Z1pIQs+4apoDdXn/uB /S9LI/O7sOgLqkNfulMlpgr8oiGe8wJZzDpmKJ1iWZfS81tvpI9R5UdBNeBTb0ABBJC4 McqXz6rnLGUmTn4QzJkCe4L38RE35QK2+223Ksr2RDVoHVm9N3L++bb5bpPW3AYpshAp tM5vEiEucR919C3IKwxpTneRWNFtsD7iqdlVwHgjJHS8ODHFzbTLCABt3VQJXk9Dwsuc eMeBEOOVckQ4luMctZWluFyv98vvjjb2GwSkIJFXBEJqNYUK4I7sBT9+fc6Eh1Y8+umM x3uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=dpxRX6SK; 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 o16-20020a170902d4d000b001b530ede2besi7748724plg.614.2023.06.27.08.03.50; Tue, 27 Jun 2023 08:04:07 -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=dpxRX6SK; 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 S232085AbjF0OqR (ORCPT + 99 others); Tue, 27 Jun 2023 10:46:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232334AbjF0OpY (ORCPT ); Tue, 27 Jun 2023 10:45:24 -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 0F11230F1; Tue, 27 Jun 2023 07:45:13 -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=fzSlg9RNv3R+3q3XKuXY+6o6TuoQBOkN0UNS+oRdi0g=; b=dpxRX6SKkutCFKOYF4CwCciL+V9U5RgWhgmvlkclZlRvImw5QJ17O2LY M9nttluQAh/UNtlB4llXPA7Jwu+IR5YR2l36V97hbUU6lLQSksCae62fb VSdf3WEpvEHszDLULnIk7nnYz+Z0KY2ThObKD3MYXOgxPiP06rK8g0GSU c=; 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="114936330" 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 To: Shannon Nelson Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org, Brett Creeley , "David S. Miller" , Eric Dumazet , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 09/24] pds_core: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:24 +0200 Message-Id: <20230627144339.144478-10-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?1769868621038607914?= X-GMAIL-MSGID: =?utf-8?q?1769868621038607914?= 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/amd/pds_core/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -u -p a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c --- a/drivers/net/ethernet/amd/pds_core/core.c +++ b/drivers/net/ethernet/amd/pds_core/core.c @@ -196,7 +196,7 @@ int pdsc_qcq_alloc(struct pdsc *pdsc, un dma_addr_t q_base_pa; int err; - qcq->q.info = vzalloc(num_descs * sizeof(*qcq->q.info)); + qcq->q.info = vcalloc(num_descs, sizeof(*qcq->q.info)); if (!qcq->q.info) { err = -ENOMEM; goto err_out; @@ -219,7 +219,7 @@ int pdsc_qcq_alloc(struct pdsc *pdsc, un if (err) goto err_out_free_q_info; - qcq->cq.info = vzalloc(num_descs * sizeof(*qcq->cq.info)); + qcq->cq.info = vcalloc(num_descs, sizeof(*qcq->cq.info)); if (!qcq->cq.info) { err = -ENOMEM; goto err_out_free_irq;