Skip to content

Commit b0992ec

Browse files
tlfalcondavem330
authored andcommitted
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: Thomas Falcon <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 3468656 commit b0992ec

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,8 @@ static void release_stats_buffers(struct ibmvnic_adapter *adapter)
354354
{
355355
kfree(adapter->tx_stats_buffers);
356356
kfree(adapter->rx_stats_buffers);
357+
adapter->tx_stats_buffers = NULL;
358+
adapter->rx_stats_buffers = NULL;
357359
}
358360

359361
static int init_stats_buffers(struct ibmvnic_adapter *adapter)
@@ -599,6 +601,8 @@ static void release_vpd_data(struct ibmvnic_adapter *adapter)
599601

600602
kfree(adapter->vpd->buff);
601603
kfree(adapter->vpd);
604+
605+
adapter->vpd = NULL;
602606
}
603607

604608
static void release_tx_pools(struct ibmvnic_adapter *adapter)
@@ -909,6 +913,7 @@ static int ibmvnic_get_vpd(struct ibmvnic_adapter *adapter)
909913
if (dma_mapping_error(dev, adapter->vpd->dma_addr)) {
910914
dev_err(dev, "Could not map VPD buffer\n");
911915
kfree(adapter->vpd->buff);
916+
adapter->vpd->buff = NULL;
912917
return -ENOMEM;
913918
}
914919

0 commit comments

Comments
 (0)