Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07184213 authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller
Browse files

ibmvnic: Fix statistics buffers memory leak 



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: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 134bbe7f

drivers/net/ethernet/ibm/ibmvnic.c

+15 −9
Original line number Diff line number Diff line
@@ -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;

}
@@ -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);
@@ -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);