Skip to content

Commit a5bfe6b

Browse files
maorgottliebSaeed Mahameed
authored andcommitted
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: cefc235 ("net/mlx5: Fix FTE cleanup") Signed-off-by: Maor Gottlieb <maorg@nvidia.com> Reviewed-by: Alaa Hleihel <alaa@nvidia.com> Reviewed-by: Mark Bloch <mbloch@nvidia.com> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
1 parent ed5e83a commit a5bfe6b

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

  • drivers/net/ethernet/mellanox/mlx5/core

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1760,6 +1760,7 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,
17601760
if (!fte_tmp)
17611761
continue;
17621762
rule = add_rule_fg(g, spec, flow_act, dest, dest_num, fte_tmp);
1763+
/* No error check needed here, because insert_fte() is not called */
17631764
up_write_ref_node(&fte_tmp->node, false);
17641765
tree_put_node(&fte_tmp->node, false);
17651766
kmem_cache_free(steering->ftes_cache, fte);
@@ -1812,6 +1813,8 @@ try_add_to_existing_fg(struct mlx5_flow_table *ft,
18121813
up_write_ref_node(&g->node, false);
18131814
rule = add_rule_fg(g, spec, flow_act, dest, dest_num, fte);
18141815
up_write_ref_node(&fte->node, false);
1816+
if (IS_ERR(rule))
1817+
tree_put_node(&fte->node, false);
18151818
return rule;
18161819
}
18171820
rule = ERR_PTR(-ENOENT);
@@ -1910,6 +1913,8 @@ _mlx5_add_flow_rules(struct mlx5_flow_table *ft,
19101913
up_write_ref_node(&g->node, false);
19111914
rule = add_rule_fg(g, spec, flow_act, dest, dest_num, fte);
19121915
up_write_ref_node(&fte->node, false);
1916+
if (IS_ERR(rule))
1917+
tree_put_node(&fte->node, false);
19131918
tree_put_node(&g->node, false);
19141919
return rule;
19151920

0 commit comments

Comments
 (0)