arfs_create_groups() creates up to two flow groups in ft->g[], and increments ft->num_groups for each group that was created successfully. If creating the second group fails, the error path frees ft->g and sets it to NULL, but leaves ft->num_groups at 1. The only caller, arfs_create_table(), calls mlx5e_destroy_flow_table() on the error path, which calls mlx5e_destroy_groups(). The latter walks ft->g[] from ft->num_groups - 1 down to 0 and dereferences ft->g[0]. Since ft->g was freed and set to NULL, this is a NULL pointer dereference, and the kernel oopses. The same error path also leaks the flow group that was created successfully before the failure, since ft->g is freed without the group being destroyed. Freeing ft->g here was added by commit 3c6d5189246f ("net/mlx5e: fix a double-free in arfs_create_groups"). Before that commit, the group failure path did not touch ft->g at all, so the caller destroyed the flow groups that had been created and then freed the array. That commit fixed a double free in the allocation failure path by freeing ft->g here as well, and in doing so changed the group failure path too. Rather than also resetting ft->num_groups, leave the free of ft->g to the caller: mlx5e_destroy_flow_table() frees ft->g exactly once, and also destroys the flow groups that were created. This fixes the NULL pointer dereference and the leak, while keeping the double free fixed. This also makes the error handling of this function consistent with the rest of the driver, e.g. mlx5e_create_l2_table(). Fixes: 3c6d5189246f ("net/mlx5e: fix a double-free in arfs_create_groups") Signed-off-by: Jinvas --- drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c b/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c index c5e62d7..7888d38 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c @@ -267,7 +267,7 @@ static int arfs_create_groups(struct mlx5e_flow_table *ft, in = kvzalloc(inlen, GFP_KERNEL); if (!in) { err = -ENOMEM; - goto err_free_g; + goto err_free_in; } mc = MLX5_ADDR_OF(create_flow_group_in, in, match_criteria); @@ -338,9 +338,6 @@ err_clean_group: ft->g[ft->num_groups] = NULL; err_free_in: kvfree(in); -err_free_g: - kfree(ft->g); - ft->g = NULL; return err; } -- 2.28.0.windows.1