Commit f6ebca8e authored by Sukadev Bhattiprolu's avatar Sukadev Bhattiprolu Committed by David S. Miller
Browse files

ibmvnic: free tx_pool if tso_pool alloc fails 



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: default avatarSukadev Bhattiprolu <sukadev@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 552a3372

drivers/net/ethernet/ibm/ibmvnic.c

+4 −1
Original line number Diff line number Diff line
@@ -778,8 +778,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;