Commit 3380206e authored Jun 23, 2021 by Sukadev Bhattiprolu Committed by Greg Kroah-Hartman Jul 14, 2021

ibmvnic: free tx_pool if tso_pool alloc fails



[ Upstream commit f6ebca8efa52e4ae770f0325d618e7bcf08ada0c ]

Free tx_pool and clear it, if allocation of tso_pool fails.

release_tx_pools() assumes we have both tx and tso_pools if ->tx_pool is
non-NULL. If allocation of tso_pool fails in init_tx_pools(), the assumption
will not be true and we would end up dereferencing ->tx_buff, ->free_map
fields from a NULL pointer.

Fixes: 3205306c ("ibmvnic: Update TX pool initialization routine")
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 867a9900

drivers/net/ethernet/ibm/ibmvnic.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -694,8 +694,11 @@ static int init_tx_pools(struct net_device *netdev)

		adapter->tso_pool = kcalloc(tx_subcrqs,
		sizeof(struct ibmvnic_tx_pool), GFP_KERNEL);
		if (!adapter->tso_pool)
		if (!adapter->tso_pool) {
		kfree(adapter->tx_pool);
		adapter->tx_pool = NULL;
		return -1;
		}

		adapter->num_active_tx_pools = tx_subcrqs;