Commit b0992eca authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller

ibmvnic: Ensure that buffers are NULL after free

This change will guard against a double free in the case that the
buffers were previously freed at some other time, such as during
a device reset. It resolves a kernel oops that occurred when changing
the VNIC device's MTU.
Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3468656f
...@@ -354,6 +354,8 @@ static void release_stats_buffers(struct ibmvnic_adapter *adapter) ...@@ -354,6 +354,8 @@ static void release_stats_buffers(struct ibmvnic_adapter *adapter)
{ {
kfree(adapter->tx_stats_buffers); kfree(adapter->tx_stats_buffers);
kfree(adapter->rx_stats_buffers); kfree(adapter->rx_stats_buffers);
adapter->tx_stats_buffers = NULL;
adapter->rx_stats_buffers = NULL;
} }
static int init_stats_buffers(struct ibmvnic_adapter *adapter) static int init_stats_buffers(struct ibmvnic_adapter *adapter)
...@@ -599,6 +601,8 @@ static void release_vpd_data(struct ibmvnic_adapter *adapter) ...@@ -599,6 +601,8 @@ static void release_vpd_data(struct ibmvnic_adapter *adapter)
kfree(adapter->vpd->buff); kfree(adapter->vpd->buff);
kfree(adapter->vpd); kfree(adapter->vpd);
adapter->vpd = NULL;
} }
static void release_tx_pools(struct ibmvnic_adapter *adapter) static void release_tx_pools(struct ibmvnic_adapter *adapter)
...@@ -909,6 +913,7 @@ static int ibmvnic_get_vpd(struct ibmvnic_adapter *adapter) ...@@ -909,6 +913,7 @@ static int ibmvnic_get_vpd(struct ibmvnic_adapter *adapter)
if (dma_mapping_error(dev, adapter->vpd->dma_addr)) { if (dma_mapping_error(dev, adapter->vpd->dma_addr)) {
dev_err(dev, "Could not map VPD buffer\n"); dev_err(dev, "Could not map VPD buffer\n");
kfree(adapter->vpd->buff); kfree(adapter->vpd->buff);
adapter->vpd->buff = NULL;
return -ENOMEM; return -ENOMEM;
} }
......
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