Commit ef4c5afc authored by Yevgeny Kliteynik's avatar Yevgeny Kliteynik Committed by Saeed Mahameed
Browse files

net/mlx5: DR, Fix wrong action data allocation in decap action 



When TUNNEL_L3_TO_L2 decap action was created, a pointer to a local
variable was passed as its HW action data, resulting in attempt to
free invalid address:

  BUG: KASAN: invalid-free in mlx5dr_action_destroy+0x318/0x410 [mlx5_core]

Fixes: 4781df92 ("net/mlx5: DR, Move STEv0 modify header logic")
Signed-off-by: default avatarYevgeny Kliteynik <kliteyn@nvidia.com>
Reviewed-by: default avatarAlex Vesker <valex@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 87cd0649

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_action.c

+7 −1
Original line number Diff line number Diff line
@@ -1421,9 +1421,13 @@ dr_action_create_reformat_action(struct mlx5dr_domain *dmn, 
	}

	case DR_ACTION_TYP_TNL_L3_TO_L2:

	{

		u8 hw_actions[DR_ACTION_CACHE_LINE_SIZE] = {};

		u8 *hw_actions;

		int ret;



		hw_actions = kzalloc(DR_ACTION_CACHE_LINE_SIZE, GFP_KERNEL);

		if (!hw_actions)

			return -ENOMEM;



		ret = mlx5dr_ste_set_action_decap_l3_list(dmn->ste_ctx,

							  data, data_sz,

							  hw_actions,
@@ -1431,6 +1435,7 @@ dr_action_create_reformat_action(struct mlx5dr_domain *dmn, 
							  &action->rewrite->num_of_actions);

		if (ret) {

			mlx5dr_dbg(dmn, "Failed creating decap l3 action list\n");

			kfree(hw_actions);

			return ret;

		}
@@ -1440,6 +1445,7 @@ dr_action_create_reformat_action(struct mlx5dr_domain *dmn, 
		ret = mlx5dr_ste_alloc_modify_hdr(action);

		if (ret) {

			mlx5dr_dbg(dmn, "Failed preparing reformat data\n");

			kfree(hw_actions);

			return ret;

		}

		return 0;