From patchwork Tue Jun 27 14:43:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 113471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8267306vqr; Tue, 27 Jun 2023 08:06:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4GHjF6SBPaJWCZdOXYHHR0uyzfKtdU0hOtTmNKvbtu6FI9Z4+sCMxZxIsJhbDeIXWKT2N6 X-Received: by 2002:a17:903:1245:b0:1b4:5697:d991 with SMTP id u5-20020a170903124500b001b45697d991mr11342528plh.15.1687878398208; Tue, 27 Jun 2023 08:06:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687878398; cv=none; d=google.com; s=arc-20160816; b=TeArQFxIdqdRc/r8ZlwYrUwsdcqrvprIpDnklCDtsh5BTPhmKlRzzrsneH5v7Eo3MX OKLQWFYl7izLc4CT4VNTCp1ybckbnSR2om+DB9R+RI0+2SmVlI03oqpETNYlaC2pm1jM 5i0Y0iXOw9o7vPI/8UN8oJmqKpEe5maSwkRcqMu1tjRoYLJcXFbyldC38eDvlmk+BJzS 5zEEfP7drjmxHLj+w1K4XzOW7wksPHh9I8yLaiG5fjSisWuDpcosvq7RiB2iKAQ6Pd4T yXMBE16HsAOoI20AYiLjzp8afCDXN0IV1DkpvDMCf2PryWiU0AlIUnKoeBhZ4b/ASI09 YTfg== 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=EVWsKZHA5sOX60HufObe+UOCTdtjhEjhk52tD7khaXk=; fh=eOmvIS7lT6UGkAkNGkrYPducpbNj1vRpvotfriH1k1c=; b=uYM7qzqnviuOjWFxIYTrQpy6kkuPge7gQ+anOYwJi5b3XbzATMkvNzsSGZUQhFTkdE jk2i5AfxHO7wTJKsiWr1pVD52hThUD2MtNUiwQWzvtbKVjHkyRoBfoojvOiHasxM0pmj hsTpgBEtpHSLTujvF34Li5yte+ickZ1V542UivYnENHcBkBVfuQS976Z92jK9cpEpkeo W1VH4amDd070XdqpMFTaSGhqvDhD9uOSWmGIEzsdFbu+myyYoSoABBA6PLw/1vqe8BKR rLwsRErsizqoZTiaPainlFd8W/h/7XTlzBzkXnb9EJrcSbrqQ5H6t0JJZzcHwXqQJi2J cvlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@inria.fr header.s=dc header.b=YiBhSF6i; 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.05.36; Tue, 27 Jun 2023 08:06:38 -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=YiBhSF6i; 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 S231925AbjF0Op3 (ORCPT + 99 others); Tue, 27 Jun 2023 10:45:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232063AbjF0Ooy (ORCPT ); Tue, 27 Jun 2023 10:44:54 -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 D7E1730F9; Tue, 27 Jun 2023 07:44:31 -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=EVWsKZHA5sOX60HufObe+UOCTdtjhEjhk52tD7khaXk=; b=YiBhSF6iFx9Y7bUlk/oeZ9e9XBU2wtUjxdXzeaWAa04130mi7xMLwQ7/ D5clOwTGrRgCVQj0YszXht1xsutUj8JN6X+TOWF432vl0LvK2epGu++PW JSpcR1yhL2M21hPKmCNNbg74dczchrf+cqRoFMmR/AbJ/HrTa9At4AYdg U=; 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="114936319" 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: Veerasenareddy Burru Cc: kernel-janitors@vger.kernel.org, keescook@chromium.org, christophe.jaillet@wanadoo.fr, kuba@kernel.org, Abhijit Ayarekar , "David S. Miller" , Eric Dumazet , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 02/24] octeon_ep: use vmalloc_array and vcalloc Date: Tue, 27 Jun 2023 16:43:17 +0200 Message-Id: <20230627144339.144478-3-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?1769868779528645403?= X-GMAIL-MSGID: =?utf-8?q?1769868779528645403?= 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/marvell/octeon_ep/octep_rx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -u -p a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c --- a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c @@ -158,7 +158,7 @@ static int octep_setup_oq(struct octep_d goto desc_dma_alloc_err; } - oq->buff_info = vzalloc(oq->max_count * OCTEP_OQ_RECVBUF_SIZE); + oq->buff_info = vcalloc(oq->max_count, OCTEP_OQ_RECVBUF_SIZE); if (unlikely(!oq->buff_info)) { dev_err(&oct->pdev->dev, "Failed to allocate buffer info for OQ-%d\n", q_no);