From patchwork Tue Jun 27 14:43:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 113482 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8271598vqr; Tue, 27 Jun 2023 08:11:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ74n6LNdq1aQGCk238vgbwUFyz6wpTdbYSH39B/N9z0I3kKxuSFa5twI4mbGc6cYev/OqYw X-Received: by 2002:a05:6512:348e:b0:4fb:745e:dd01 with SMTP id v14-20020a056512348e00b004fb745edd01mr3564572lfr.45.1687878682121; Tue, 27 Jun 2023 08:11:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687878682; cv=none; d=google.com; s=arc-20160816; b=oxbzd8mTL01cvNhOaqRJKjCPIDD8ynjP8tLAp84I3HP05IRdv7d+hg4LvIifI2LVkh ATH6/G5P7HKX5zLzffyoWGNEaLM6TwBEgXL4BrbUeoAO0cuD0WMuHDYOaeQpuuTKCD07 QZ9g9CDSE1tsOa00DlIh9qV1sVAJ6TnLM44vhIB7mdobgPIfi6lIPfrSUC7FLdljNiRN erIvC7ARuBVutiXJBscEs3vXNC5s82bWuKHm8Fsxf7N/kqtwPC0fBbiB/9aLZlNwJy5j QfcPfijFGJmyrkX3ShD6zzslmeHTfEF9FY9P++YQfzLUiEgtxB75rdwzOpsaE1luI/dT 1QNQ== 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=OHv2BAP3aRkKkSVfOQ7PNXJXXJkfxWmwjM1eG5qnd00=; fh=Ygz6F1xnF1zM4n1U3QukXT1v1FK1PfRfZlLDTSzpaMU=; b=wEkd2OLwO/hfuB+r+ySVavmeA/CJSDP4fK3NdU7sgVuY1q4q41biQWViAkTeJ3olSu HMT7fr6EfDHmGlLRQTXaZ+HVp+rDhb8PZ7G1oiGDfPu/OlP8zWrwxpFVNhKclQH4kpy5 O2r+fIVy1Ocv68M+CMKYvHpF5OtAmEWCWvCMlnIJZ9qWHNxOBLucCzVZOPDTrFcvs1d1 VV/xtG4eX+GQCXewvMYzbhzRRNa2lNB27Iq7K7LhZwEKeVgPmTEc+Z2EXi8iLzr+hVbb N80VOjuofok9fiVad5vit7O6HeS0Lsszk/JXe0f7MP3wVgYVKQj5+6FFdziYYdVidRiN cnCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=uWxagvqS; 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 d15-20020a056402000f00b005184a09e9basi3862147edu.601.2023.06.27.08.10.55; Tue, 27 Jun 2023 08:11:22 -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=uWxagvqS; 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 S231981AbjF0Opu (ORCPT + 99 others); Tue, 27 Jun 2023 10:45:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232207AbjF0OpL (ORCPT ); Tue, 27 Jun 2023 10:45:11 -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 A67463593; Tue, 27 Jun 2023 07:44:47 -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=OHv2BAP3aRkKkSVfOQ7PNXJXXJkfxWmwjM1eG5qnd00=; b=uWxagvqScJ4P/eaWlwExiFn9fJPU7N64Zvsr7shHMa+4qAIIkcRXjsDK eOh6XoEpvq48Xf/zwXlYXqObrFaDd1vUTLpcpW1DabzmJuEMY/JqpRasu FjmjeNNt/ww0IQj/LKk3VC2H1IcYqjOTpYP+fvSDTIMkkqW1wJ61EbMFv Q=; 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="114936322" 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: Cheng Xu Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org, Kai Shen , Jason Gunthorpe , Leon Romanovsky , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 05/24] RDMA/erdma: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:20 +0200 Message-Id: <20230627144339.144478-6-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?1769869076622581369?= X-GMAIL-MSGID: =?utf-8?q?1769869076622581369?= 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/infiniband/hw/erdma/erdma_verbs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -u -p a/drivers/infiniband/hw/erdma/erdma_verbs.c b/drivers/infiniband/hw/erdma/erdma_verbs.c --- a/drivers/infiniband/hw/erdma/erdma_verbs.c +++ b/drivers/infiniband/hw/erdma/erdma_verbs.c @@ -481,8 +481,8 @@ static int init_kernel_qp(struct erdma_d dev->func_bar + (ERDMA_SDB_SHARED_PAGE_INDEX << PAGE_SHIFT); kqp->hw_rq_db = dev->func_bar + ERDMA_BAR_RQDB_SPACE_OFFSET; - kqp->swr_tbl = vmalloc(qp->attrs.sq_size * sizeof(u64)); - kqp->rwr_tbl = vmalloc(qp->attrs.rq_size * sizeof(u64)); + kqp->swr_tbl = vmalloc_array(qp->attrs.sq_size, sizeof(u64)); + kqp->rwr_tbl = vmalloc_array(qp->attrs.rq_size, sizeof(u64)); if (!kqp->swr_tbl || !kqp->rwr_tbl) goto err_out;