Commit 69d08dcb authored by John Allen's avatar John Allen Committed by David S. Miller
Browse files

ibmvnic: Allocate and request vpd in init_resources 



In reset events in which our memory allocations need to be reallocated,
VPD data is being freed, but never reallocated. This can cause issues if
we later attempt to access that memory or reset and attempt to free the
memory. This patch moves the allocation of the VPD data to init_resources
so that it will be symmetrically freed during release resources.

Signed-off-by: default avatarJohn Allen <jallen@linux.vnet.ibm.com>
Reviewed-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7913803

drivers/net/ethernet/ibm/ibmvnic.c

+9 −7
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ static int ibmvnic_get_vpd(struct ibmvnic_adapter *adapter) 
	if (adapter->vpd->buff)

		len = adapter->vpd->len;



	reinit_completion(&adapter->fw_done);

	init_completion(&adapter->fw_done);

	crq.get_vpd_size.first = IBMVNIC_CRQ_CMD;

	crq.get_vpd_size.cmd = GET_VPD_SIZE;

	ibmvnic_send_crq(adapter, &crq);
@@ -943,6 +943,13 @@ static int init_resources(struct ibmvnic_adapter *adapter) 
	if (!adapter->vpd)

		return -ENOMEM;



	/* Vital Product Data (VPD) */

	rc = ibmvnic_get_vpd(adapter);

	if (rc) {

		netdev_err(netdev, "failed to initialize Vital Product Data (VPD)\n");

		return rc;

	}



	adapter->map_id = 1;

	adapter->napi = kcalloc(adapter->req_rx_queues,

				sizeof(struct napi_struct), GFP_KERNEL);
@@ -1016,7 +1023,7 @@ static int __ibmvnic_open(struct net_device *netdev) 
static int ibmvnic_open(struct net_device *netdev)

{

	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

	int rc, vpd;

	int rc;



	mutex_lock(&adapter->reset_lock);
@@ -1039,11 +1046,6 @@ static int ibmvnic_open(struct net_device *netdev) 
	rc = __ibmvnic_open(netdev);

	netif_carrier_on(netdev);



	/* Vital Product Data (VPD) */

	vpd = ibmvnic_get_vpd(adapter);

	if (vpd)

		netdev_err(netdev, "failed to initialize Vital Product Data (VPD)\n");



	mutex_unlock(&adapter->reset_lock);



	return rc;