diff mbox series

[18/26] net: enetc: use array_size

Message ID	20230623211457.102544-19-Julia.Lawall@inria.fr
State	New
Headers	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; From: Julia Lawall <Julia.Lawall@inria.fr> To: Claudiu Manoil <claudiu.manoil@nxp.com> Cc: keescook@chromium.org, kernel-janitors@vger.kernel.org, Vladimir Oltean <vladimir.oltean@nxp.com>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 18/26] net: enetc: use array_size Date: Fri, 23 Jun 2023 23:14:49 +0200 Message-Id: <20230623211457.102544-19-Julia.Lawall@inria.fr> In-Reply-To: <20230623211457.102544-1-Julia.Lawall@inria.fr> References: <20230623211457.102544-1-Julia.Lawall@inria.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	use array_size \| [00/26] use array_size [01/26] lib/test_vmalloc.c: use array_size [02/26] octeon_ep: use array_size [03/26] drm/gud: use array_size [04/26] gve: use array_size [05/26] RDMA/erdma: use array_size [06/26] dma-buf: system_heap: use array_size [07/26] scsi: fnic: use array_size [08/26] virtio-mem: use array_size [09/26] pds_core: use array_size [10/26] bus: mhi: host: use array_size [11/26] ionic: use array_size [12/26] btrfs: zoned: use array_size [13/26] iommu/tegra: gart: use array_size [14/26] RDMA/siw: use array_size [15/26] habanalabs: use array_size [16/26] drm/i915/gvt: use array_size [17/26] kcov: use array_size [18/26] net: enetc: use array_size [19/26] RDMA/bnxt_re: use array_size [20/26] drm/vmwgfx: use array_size [21/26] x86/sgx: use array_size [22/26] net: mana: use array_size [23/26] media: staging: imgu: use array_size [24/26] scsi: qla2xxx: use array_size [25/26] vduse: use array_size [26/26] comedi: use array_size

Commit Message

Julia Lawall June 23, 2023, 9:14 p.m. UTC

  Use array_size to protect against multiplication overflows.

The changes were done using the following Coccinelle semantic patch:

// <smpl>
@@
    expression E1, E2;
    constant C1, C2;
    identifier alloc = {vmalloc,vzalloc};
@@
    
(
      alloc(C1 * C2,...)
|
      alloc(
-           (E1) * (E2)
+           array_size(E1, E2)
      ,...)
)
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>

---
 drivers/net/ethernet/freescale/enetc/enetc.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Simon Horman June 24, 2023, 3:48 p.m. UTC | #1

On Fri, Jun 23, 2023 at 11:14:49PM +0200, Julia Lawall wrote:
> Use array_size to protect against multiplication overflows.
> 
> The changes were done using the following Coccinelle semantic patch:
> 
> // <smpl>
> @@
>     expression E1, E2;
>     constant C1, C2;
>     identifier alloc = {vmalloc,vzalloc};
> @@
>     
> (
>       alloc(C1 * C2,...)
> |
>       alloc(
> -           (E1) * (E2)
> +           array_size(E1, E2)
>       ,...)
> )
> // </smpl>
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@inria.fr>

Reviewed-by: Simon Horman <simon.horman@corigine.com>

diff mbox series

Patch

diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 9e1b2536e9a9..7231f8ea1ba4 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -1790,7 +1790,7 @@  static int enetc_alloc_tx_resource(struct enetc_bdr_resource *res,
 	res->bd_count = bd_count;
 	res->bd_size = sizeof(union enetc_tx_bd);
 
-	res->tx_swbd = vzalloc(bd_count * sizeof(*res->tx_swbd));
+	res->tx_swbd = vzalloc(array_size(bd_count, sizeof(*res->tx_swbd)));
 	if (!res->tx_swbd)
 		return -ENOMEM;
 
@@ -1878,7 +1878,7 @@  static int enetc_alloc_rx_resource(struct enetc_bdr_resource *res,
 	if (extended)
 		res->bd_size *= 2;
 
-	res->rx_swbd = vzalloc(bd_count * sizeof(struct enetc_rx_swbd));
+	res->rx_swbd = vzalloc(array_size(bd_count, sizeof(struct enetc_rx_swbd)));
 	if (!res->rx_swbd)
 		return -ENOMEM;