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

Commit 333fd109 authored by Vlad Buslov's avatar Vlad Buslov Committed by Greg Kroah-Hartman
Browse files

Revert "net/mlx5e: fix double free of encap_header" 



[ Upstream commit 5d089684dc434a31e08d32f0530066d0025c52e4 ]

This reverts commit 6f9b1a0731662648949a1c0587f6acb3b7f8acf1.

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

Fixes: 6f9b1a073166 ("net/mlx5e: fix double free of encap_header")
Signed-off-by: default avatarVlad Buslov <vladbu@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7bd305f5

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

+6 −4
Original line number Diff line number Diff line
@@ -290,6 +290,9 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv, 
	if (err)

		goto destroy_neigh_entry;



	e->encap_size = ipv4_encap_size;

	e->encap_header = encap_header;



	if (!(nud_state & NUD_VALID)) {

		neigh_event_send(n, NULL);

		/* the encap entry will be made valid on neigh update event
@@ -306,8 +309,6 @@ int mlx5e_tc_tun_create_header_ipv4(struct mlx5e_priv *priv, 
		goto destroy_neigh_entry;

	}



	e->encap_size = ipv4_encap_size;

	e->encap_header = encap_header;

	e->flags |= MLX5_ENCAP_ENTRY_VALID;

	mlx5e_rep_queue_neigh_stats_work(netdev_priv(out_dev));

	neigh_release(n);
@@ -407,6 +408,9 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, 
	if (err)

		goto destroy_neigh_entry;



	e->encap_size = ipv6_encap_size;

	e->encap_header = encap_header;



	if (!(nud_state & NUD_VALID)) {

		neigh_event_send(n, NULL);

		/* the encap entry will be made valid on neigh update event
@@ -424,8 +428,6 @@ int mlx5e_tc_tun_create_header_ipv6(struct mlx5e_priv *priv, 
		goto destroy_neigh_entry;

	}



	e->encap_size = ipv6_encap_size;

	e->encap_header = encap_header;

	e->flags |= MLX5_ENCAP_ENTRY_VALID;

	mlx5e_rep_queue_neigh_stats_work(netdev_priv(out_dev));

	neigh_release(n);