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

Commit f588dccf authored by Wenwen Wang's avatar Wenwen Wang Committed by Greg Kroah-Hartman
Browse files

net/mlx4_en: fix a memory leak bug 



[ Upstream commit 48ec7014c56e5eb2fbf6f479896143622d834f3b ]

In mlx4_en_config_rss_steer(), 'rss_map->indir_qp' is allocated through
kzalloc(). After that, mlx4_qp_alloc() is invoked to configure RSS
indirection. However, if mlx4_qp_alloc() fails, the allocated
'rss_map->indir_qp' is not deallocated, leading to a memory leak bug.

To fix the above issue, add the 'qp_alloc_err' label to free
'rss_map->indir_qp'.

Fixes: 4931c6ef ("net/mlx4_en: Optimized single ring steering")
Signed-off-by: default avatarWenwen Wang <wenwen@cs.uga.edu>
Reviewed-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8905a249

drivers/net/ethernet/mellanox/mlx4/en_rx.c

+2 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv) 
	err = mlx4_qp_alloc(mdev->dev, priv->base_qpn, rss_map->indir_qp);

	if (err) {

		en_err(priv, "Failed to allocate RSS indirection QP\n");

		goto rss_err;

		goto qp_alloc_err;

	}



	rss_map->indir_qp->event = mlx4_en_sqp_event;
@@ -1244,6 +1244,7 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv) 
		       MLX4_QP_STATE_RST, NULL, 0, 0, rss_map->indir_qp);

	mlx4_qp_remove(mdev->dev, rss_map->indir_qp);

	mlx4_qp_free(mdev->dev, rss_map->indir_qp);

qp_alloc_err:

	kfree(rss_map->indir_qp);

	rss_map->indir_qp = NULL;

rss_err: