Skip to content

Commit 3c6d518

Browse files
AlexiousLuSaeed Mahameed
authored andcommitted
net/mlx5e: fix a double-free in arfs_create_groups
When `in` allocated by kvzalloc fails, arfs_create_groups will free ft->g and return an error. However, arfs_create_table, the only caller of arfs_create_groups, will hold this error and call to mlx5e_destroy_flow_table, in which the ft->g will be freed again. Fixes: 1cabe6b ("net/mlx5e: Create aRFS flow tables") Signed-off-by: Zhipeng Lu <alexious@zju.edu.cn> Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
1 parent 315a597 commit 3c6d518

File tree

1 file changed

+15
-11
lines changed
  • drivers/net/ethernet/mellanox/mlx5/core

1 file changed

+15
-11
lines changed

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,13 @@ static int arfs_create_groups(struct mlx5e_flow_table *ft,
254254

255255
ft->g = kcalloc(MLX5E_ARFS_NUM_GROUPS,
256256
sizeof(*ft->g), GFP_KERNEL);
257-
in = kvzalloc(inlen, GFP_KERNEL);
258-
if (!in || !ft->g) {
259-
kfree(ft->g);
260-
kvfree(in);
257+
if (!ft->g)
261258
return -ENOMEM;
259+
260+
in = kvzalloc(inlen, GFP_KERNEL);
261+
if (!in) {
262+
err = -ENOMEM;
263+
goto err_free_g;
262264
}
263265

264266
mc = MLX5_ADDR_OF(create_flow_group_in, in, match_criteria);
@@ -278,7 +280,7 @@ static int arfs_create_groups(struct mlx5e_flow_table *ft,
278280
break;
279281
default:
280282
err = -EINVAL;
281-
goto out;
283+
goto err_free_in;
282284
}
283285

284286
switch (type) {
@@ -300,7 +302,7 @@ static int arfs_create_groups(struct mlx5e_flow_table *ft,
300302
break;
301303
default:
302304
err = -EINVAL;
303-
goto out;
305+
goto err_free_in;
304306
}
305307

306308
MLX5_SET_CFG(in, match_criteria_enable, MLX5_MATCH_OUTER_HEADERS);
@@ -309,7 +311,7 @@ static int arfs_create_groups(struct mlx5e_flow_table *ft,
309311
MLX5_SET_CFG(in, end_flow_index, ix - 1);
310312
ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
311313
if (IS_ERR(ft->g[ft->num_groups]))
312-
goto err;
314+
goto err_clean_group;
313315
ft->num_groups++;
314316

315317
memset(in, 0, inlen);
@@ -318,18 +320,20 @@ static int arfs_create_groups(struct mlx5e_flow_table *ft,
318320
MLX5_SET_CFG(in, end_flow_index, ix - 1);
319321
ft->g[ft->num_groups] = mlx5_create_flow_group(ft->t, in);
320322
if (IS_ERR(ft->g[ft->num_groups]))
321-
goto err;
323+
goto err_clean_group;
322324
ft->num_groups++;
323325

324326
kvfree(in);
325327
return 0;
326328

327-
err:
329+
err_clean_group:
328330
err = PTR_ERR(ft->g[ft->num_groups]);
329331
ft->g[ft->num_groups] = NULL;
330-
out:
332+
err_free_in:
331333
kvfree(in);
332-
334+
err_free_g:
335+
kfree(ft->g);
336+
ft->g = NULL;
333337
return err;
334338
}
335339

0 commit comments

Comments
 (0)