Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7739a60 authored by Eli Britstein's avatar Eli Britstein Committed by Saeed Mahameed
Browse files

net/mlx5e: Fix possible modify header actions memory leak 



The cited commit could disable the modify header flag, but did not free
the allocated memory for the modify header actions. Fix it.

Fixes: 27c11b6b ("net/mlx5e: Do not rewrite fields with the same match")
Signed-off-by: default avatarEli Britstein <elibr@mellanox.com>
Reviewed-by: default avatarRoi Dayan <roid@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 2ef86872

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

+4 −1
Original line number Diff line number Diff line
@@ -2567,8 +2567,10 @@ static int parse_tc_nic_actions(struct mlx5e_priv *priv, 
		/* in case all pedit actions are skipped, remove the MOD_HDR

		 * flag.

		 */

		if (parse_attr->num_mod_hdr_actions == 0)

		if (parse_attr->num_mod_hdr_actions == 0) {

			action &= ~MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;

			kfree(parse_attr->mod_hdr_actions);

		}

	}



	attr->action = action;
@@ -3005,6 +3007,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, 
		 */

		if (parse_attr->num_mod_hdr_actions == 0) {

			action &= ~MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;

			kfree(parse_attr->mod_hdr_actions);

			if (!((action & MLX5_FLOW_CONTEXT_ACTION_VLAN_POP) ||

			      (action & MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH)))

				attr->split_count = 0;