Commit cda7382c authored by Thomas Falcon's avatar Thomas Falcon Committed by Greg Kroah-Hartman

ibmvnic: Fix unchecked return codes of memory allocations

[ Upstream commit 7c940b1a ]

The return values for these memory allocations are unchecked,
which may cause an oops if the driver does not handle them after
a failure. Fix by checking the function's return code.
Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0c21c3ab
...@@ -438,9 +438,10 @@ static int reset_rx_pools(struct ibmvnic_adapter *adapter) ...@@ -438,9 +438,10 @@ static int reset_rx_pools(struct ibmvnic_adapter *adapter)
if (rx_pool->buff_size != be64_to_cpu(size_array[i])) { if (rx_pool->buff_size != be64_to_cpu(size_array[i])) {
free_long_term_buff(adapter, &rx_pool->long_term_buff); free_long_term_buff(adapter, &rx_pool->long_term_buff);
rx_pool->buff_size = be64_to_cpu(size_array[i]); rx_pool->buff_size = be64_to_cpu(size_array[i]);
alloc_long_term_buff(adapter, &rx_pool->long_term_buff, rc = alloc_long_term_buff(adapter,
rx_pool->size * &rx_pool->long_term_buff,
rx_pool->buff_size); rx_pool->size *
rx_pool->buff_size);
} else { } else {
rc = reset_long_term_buff(adapter, rc = reset_long_term_buff(adapter,
&rx_pool->long_term_buff); &rx_pool->long_term_buff);
...@@ -706,9 +707,9 @@ static int init_tx_pools(struct net_device *netdev) ...@@ -706,9 +707,9 @@ static int init_tx_pools(struct net_device *netdev)
return rc; return rc;
} }
init_one_tx_pool(netdev, &adapter->tso_pool[i], rc = init_one_tx_pool(netdev, &adapter->tso_pool[i],
IBMVNIC_TSO_BUFS, IBMVNIC_TSO_BUFS,
IBMVNIC_TSO_BUF_SZ); IBMVNIC_TSO_BUF_SZ);
if (rc) { if (rc) {
release_tx_pools(adapter); release_tx_pools(adapter);
return rc; return rc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment