Skip to content

Commit

Permalink
ibmvnic: Fix statistics buffers memory leak
Browse files Browse the repository at this point in the history
Move initialization of statistics buffers from ibmvnic_init function
into ibmvnic_probe. In the current state, ibmvnic_init will be called
again during a device reset, resulting in the allocation of new
buffers without freeing the old ones.

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 May 17, 2018
1 parent 134bbe7 commit 0718421
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions drivers/net/ethernet/ibm/ibmvnic.c
Original file line number Diff line number Diff line change
Expand Up @@ -4586,14 +4586,6 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
release_crq_queue(adapter);
}

rc = init_stats_buffers(adapter);
if (rc)
return rc;

rc = init_stats_token(adapter);
if (rc)
return rc;

return rc;
}

Expand Down Expand Up @@ -4662,13 +4654,21 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
goto ibmvnic_init_fail;
} while (rc == EAGAIN);

rc = init_stats_buffers(adapter);
if (rc)
goto ibmvnic_init_fail;

rc = init_stats_token(adapter);
if (rc)
goto ibmvnic_stats_fail;

netdev->mtu = adapter->req_mtu - ETH_HLEN;
netdev->min_mtu = adapter->min_mtu - ETH_HLEN;
netdev->max_mtu = adapter->max_mtu - ETH_HLEN;

rc = device_create_file(&dev->dev, &dev_attr_failover);
if (rc)
goto ibmvnic_init_fail;
goto ibmvnic_dev_file_err;

netif_carrier_off(netdev);
rc = register_netdev(netdev);
Expand All @@ -4687,6 +4687,12 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
ibmvnic_register_fail:
device_remove_file(&dev->dev, &dev_attr_failover);

ibmvnic_dev_file_err:
release_stats_token(adapter);

ibmvnic_stats_fail:
release_stats_buffers(adapter);

ibmvnic_init_fail:
release_sub_crqs(adapter, 1);
release_crq_queue(adapter);
Expand Down

0 comments on commit 0718421

Please sign in to comment.