Commit a5bfe6b4 authored by Maor Gottlieb's avatar Maor Gottlieb Committed by Saeed Mahameed
Browse files

net/mlx5: Fix leak upon failure of rule creation 



When creation of a new rule that requires allocation of an FTE fails,
need to call to tree_put_node on the FTE in order to release its'
resource.

Fixes: cefc2355 ("net/mlx5: Fix FTE cleanup")
Signed-off-by: default avatarMaor Gottlieb <maorg@nvidia.com>
Reviewed-by: default avatarAlaa Hleihel <alaa@nvidia.com>
Reviewed-by: default avatarMark Bloch <mbloch@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent ed5e83a3

drivers/net/ethernet/mellanox/mlx5/core/fs_core.c

+5 −0
Original line number Diff line number Diff line
@@ -1760,6 +1760,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft, 
		if (!fte_tmp)

			continue;

		rule = add_rule_fg(g, spec, flow_act, dest, dest_num, fte_tmp);

		/* No error check needed here, because insert_fte() is not called */

		up_write_ref_node(&fte_tmp->node, false);

		tree_put_node(&fte_tmp->node, false);

		kmem_cache_free(steering->ftes_cache, fte);
@@ -1812,6 +1813,8 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft, 
		up_write_ref_node(&g->node, false);

		rule = add_rule_fg(g, spec, flow_act, dest, dest_num, fte);

		up_write_ref_node(&fte->node, false);

		if (IS_ERR(rule))

			tree_put_node(&fte->node, false);

		return rule;

	}

	rule = ERR_PTR(-ENOENT);
@@ -1910,6 +1913,8 @@ _mlx5_add_flow_rules(struct mlx5_flow_table *ft, 
	up_write_ref_node(&g->node, false);

	rule = add_rule_fg(g, spec, flow_act, dest, dest_num, fte);

	up_write_ref_node(&fte->node, false);

	if (IS_ERR(rule))

		tree_put_node(&fte->node, false);

	tree_put_node(&g->node, false);

	return rule;