[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <817d5a9f-63c0-40b2-8e97-4a29185c0455@nvidia.com>
Date: Wed, 16 Apr 2025 15:02:13 +0300
From: Mark Bloch <mbloch@...dia.com>
To: Henry Martin <bsdhenrymartin@...il.com>, saeedm@...dia.com,
leon@...nel.org, tariqt@...dia.com, andrew+netdev@...n.ch,
davem@...emloft.net, edumazet@...gle.com, kuba@...nel.org,
pabeni@...hat.com, michal.swiatkowski@...ux.intel.com, amirtz@...dia.com
Cc: netdev@...r.kernel.org, linux-rdma@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v6 2/2] net/mlx5: Move ttc allocation after switch case to
prevent leaks
On 16/04/2025 12:22, Henry Martin wrote:
> Relocate the memory allocation for ttc table after the switch statement
> that validates params->ns_type in both mlx5_create_inner_ttc_table() and
> mlx5_create_ttc_table(). This ensures memory is only allocated after
> confirming valid input, eliminating potential memory leaks when invalid
> ns_type cases occur.
>
> Signed-off-by: Henry Martin <bsdhenrymartin@...il.com>
> ---
> .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c
> index 066121fed718..513dafd5ebf2 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c
> @@ -637,10 +637,6 @@ struct mlx5_ttc_table *mlx5_create_inner_ttc_table(struct mlx5_core_dev *dev,
> bool use_l4_type;
> int err;
>
> - ttc = kvzalloc(sizeof(*ttc), GFP_KERNEL);
> - if (!ttc)
> - return ERR_PTR(-ENOMEM);
> -
> switch (params->ns_type) {
> case MLX5_FLOW_NAMESPACE_PORT_SEL:
> use_l4_type = MLX5_CAP_GEN_2(dev, pcc_ifa2) &&
> @@ -654,6 +650,10 @@ struct mlx5_ttc_table *mlx5_create_inner_ttc_table(struct mlx5_core_dev *dev,
> return ERR_PTR(-EINVAL);
> }
>
> + ttc = kvzalloc(sizeof(*ttc), GFP_KERNEL);
> + if (!ttc)
> + return ERR_PTR(-ENOMEM);
> +
> ns = mlx5_get_flow_namespace(dev, params->ns_type);
> if (!ns) {
> kvfree(ttc);
> @@ -715,10 +715,6 @@ struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev,
> bool use_l4_type;
> int err;
>
> - ttc = kvzalloc(sizeof(*ttc), GFP_KERNEL);
> - if (!ttc)
> - return ERR_PTR(-ENOMEM);
> -
> switch (params->ns_type) {
> case MLX5_FLOW_NAMESPACE_PORT_SEL:
> use_l4_type = MLX5_CAP_GEN_2(dev, pcc_ifa2) &&
> @@ -732,6 +728,10 @@ struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev,
> return ERR_PTR(-EINVAL);
> }
>
> + ttc = kvzalloc(sizeof(*ttc), GFP_KERNEL);
> + if (!ttc)
> + return ERR_PTR(-ENOMEM);
> +
> ns = mlx5_get_flow_namespace(dev, params->ns_type);
> if (!ns) {
> kvfree(ttc);
Reviewed-by: Mark Bloch <mbloch@...dia.com>
Mark
Powered by blists - more mailing lists