Commit 66ca8d4d authored by Vlad Buslov's avatar Vlad Buslov Committed by Saeed Mahameed
Browse files

Revert "net/mlx5e: fix double free of encap_header in update funcs" 



This reverts commit 3a4aa3cb.

This patch is causing a null ptr issue, the proper fix is in the next
patch.

Fixes: 3a4aa3cb ("net/mlx5e: fix double free of encap_header in update funcs")
Signed-off-by: default avatarVlad Buslov <vladbu@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 97028173

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

+10 −10
Original line number Diff line number Diff line
@@ -403,12 +403,16 @@ int mlx5e_tc_tun_update_header_ipv4(struct mlx5e_priv *priv, 
	if (err)

		goto free_encap;



	e->encap_size = ipv4_encap_size;

	kfree(e->encap_header);

	e->encap_header = encap_header;



	if (!(nud_state & NUD_VALID)) {

		neigh_event_send(attr.n, NULL);

		/* the encap entry will be made valid on neigh update event

		 * and not used before that.

		 */

		goto free_encap;

		goto release_neigh;

	}



	memset(&reformat_params, 0, sizeof(reformat_params));
@@ -422,10 +426,6 @@ int mlx5e_tc_tun_update_header_ipv4(struct mlx5e_priv *priv, 
		goto free_encap;

	}



	e->encap_size = ipv4_encap_size;

	kfree(e->encap_header);

	e->encap_header = encap_header;



	e->flags |= MLX5_ENCAP_ENTRY_VALID;

	mlx5e_rep_queue_neigh_stats_work(netdev_priv(attr.out_dev));

	mlx5e_route_lookup_ipv4_put(&attr);
@@ -669,12 +669,16 @@ int mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv, 
	if (err)

		goto free_encap;



	e->encap_size = ipv6_encap_size;

	kfree(e->encap_header);

	e->encap_header = encap_header;



	if (!(nud_state & NUD_VALID)) {

		neigh_event_send(attr.n, NULL);

		/* the encap entry will be made valid on neigh update event

		 * and not used before that.

		 */

		goto free_encap;

		goto release_neigh;

	}



	memset(&reformat_params, 0, sizeof(reformat_params));
@@ -688,10 +692,6 @@ int mlx5e_tc_tun_update_header_ipv6(struct mlx5e_priv *priv, 
		goto free_encap;

	}



	e->encap_size = ipv6_encap_size;

	kfree(e->encap_header);

	e->encap_header = encap_header;



	e->flags |= MLX5_ENCAP_ENTRY_VALID;

	mlx5e_rep_queue_neigh_stats_work(netdev_priv(attr.out_dev));

	mlx5e_route_lookup_ipv6_put(&attr);