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

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

IB/mlx4: Fix memory leaks 



[ Upstream commit 5c1baaa82cea2c815a5180ded402a7cd455d1810 ]

In mlx4_ib_alloc_pv_bufs(), 'tun_qp->tx_ring' is allocated through
kcalloc(). However, it is not always deallocated in the following execution
if an error occurs, leading to memory leaks. To fix this issue, free
'tun_qp->tx_ring' whenever an error occurs.

Signed-off-by: default avatarWenwen Wang <wenwen@cs.uga.edu>
Acked-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Link: https://lore.kernel.org/r/1566159781-4642-1-git-send-email-wenwen@cs.uga.edu


Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5b443f8c

drivers/infiniband/hw/mlx4/mad.c

+2 −2
Original line number Diff line number Diff line
@@ -1680,8 +1680,6 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx, 
				    tx_buf_size, DMA_TO_DEVICE);

		kfree(tun_qp->tx_ring[i].buf.addr);

	}

	kfree(tun_qp->tx_ring);

	tun_qp->tx_ring = NULL;

	i = MLX4_NUM_TUNNEL_BUFS;

err:

	while (i > 0) {
@@ -1690,6 +1688,8 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx, 
				    rx_buf_size, DMA_FROM_DEVICE);

		kfree(tun_qp->ring[i].addr);

	}

	kfree(tun_qp->tx_ring);

	tun_qp->tx_ring = NULL;

	kfree(tun_qp->ring);

	tun_qp->ring = NULL;

	return -ENOMEM;