Skip to content

Commit

Permalink
ibmvnic: Ensure that buffers are NULL after free
Browse files Browse the repository at this point in the history
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: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Thomas Falcon authored and David S. Miller committed Feb 8, 2018
1 parent 3468656 commit b0992ec
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/net/ethernet/ibm/ibmvnic.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,8 @@ static void release_stats_buffers(struct ibmvnic_adapter *adapter)
{
kfree(adapter->tx_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)
Expand Down Expand Up @@ -599,6 +601,8 @@ static void release_vpd_data(struct ibmvnic_adapter *adapter)

kfree(adapter->vpd->buff);
kfree(adapter->vpd);

adapter->vpd = NULL;
}

static void release_tx_pools(struct ibmvnic_adapter *adapter)
Expand Down Expand Up @@ -909,6 +913,7 @@ static int ibmvnic_get_vpd(struct ibmvnic_adapter *adapter)
if (dma_mapping_error(dev, adapter->vpd->dma_addr)) {
dev_err(dev, "Could not map VPD buffer\n");
kfree(adapter->vpd->buff);
adapter->vpd->buff = NULL;
return -ENOMEM;
}

Expand Down

0 comments on commit b0992ec

Please sign in to comment.