xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ibmvnic: set ltb->buff to NULL after freeing

Browse Source 
[ Upstream commit 552a33729f1a7cc5115d0752064fe9abd6e3e336 ]

free_long_term_buff() checks ltb->buff to decide whether we have a long
term buffer to free. So set ltb->buff to NULL afer freeing. While here,
also clear ->map_id, fix up some coding style and log an error.

Fixes: 9c4eaabd1b ("Check CRQ command return codes")
Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Sukadev Bhattiprolu
2021-06-23 21:13:14 -07:00
committed by Greg Kroah-Hartman
parent 3f85d2ca32
commit f25accc4fd
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/ethernet/ibm/ibmvnic.c
View File

@@ -212,12 +212,11 @@ static int alloc_long_term_buff(struct ibmvnic_adapter *adapter,
mutex_lock(&adapter->fw_lock); mutex_lock(&adapter->fw_lock);
adapter->fw_done_rc = 0; adapter->fw_done_rc = 0;
reinit_completion(&adapter->fw_done); reinit_completion(&adapter->fw_done);
rc = send_request_map(adapter, ltb->addr,
ltb->size, ltb->map_id); rc = send_request_map(adapter, ltb->addr, ltb->size, ltb->map_id);
if (rc) { if (rc) {
dma_free_coherent(dev, ltb->size, ltb->buff, ltb->addr); dev_err(dev, "send_request_map failed, rc = %d\n", rc);
mutex_unlock(&adapter->fw_lock); goto out;
return rc;
} }
rc = ibmvnic_wait_for_completion(adapter, &adapter->fw_done, 10000); rc = ibmvnic_wait_for_completion(adapter, &adapter->fw_done, 10000);
@@ -225,20 +224,23 @@ static int alloc_long_term_buff(struct ibmvnic_adapter *adapter,
dev_err(dev, dev_err(dev,
"Long term map request aborted or timed out,rc = %d\n", "Long term map request aborted or timed out,rc = %d\n",
rc); rc);
dma_free_coherent(dev, ltb->size, ltb->buff, ltb->addr); goto out;
mutex_unlock(&adapter->fw_lock);
return rc;
} }
if (adapter->fw_done_rc) { if (adapter->fw_done_rc) {
dev_err(dev, "Couldn't map long term buffer,rc = %d\n", dev_err(dev, "Couldn't map long term buffer,rc = %d\n",
adapter->fw_done_rc); adapter->fw_done_rc);
rc = -1;
goto out;
}
rc = 0;
out:
if (rc) {
dma_free_coherent(dev, ltb->size, ltb->buff, ltb->addr); dma_free_coherent(dev, ltb->size, ltb->buff, ltb->addr);
mutex_unlock(&adapter->fw_lock); ltb->buff = NULL;
return -1;
} }
mutex_unlock(&adapter->fw_lock); mutex_unlock(&adapter->fw_lock);
return 0; return rc;
} }
static void free_long_term_buff(struct ibmvnic_adapter *adapter, static void free_long_term_buff(struct ibmvnic_adapter *adapter,
@@ -258,6 +260,8 @@ static void free_long_term_buff(struct ibmvnic_adapter *adapter,
adapter->reset_reason != VNIC_RESET_TIMEOUT) adapter->reset_reason != VNIC_RESET_TIMEOUT)
send_request_unmap(adapter, ltb->map_id); send_request_unmap(adapter, ltb->map_id);
dma_free_coherent(dev, ltb->size, ltb->buff, ltb->addr); dma_free_coherent(dev, ltb->size, ltb->buff, ltb->addr);
ltb->buff = NULL;
ltb->map_id = 0;
} }
static int reset_long_term_buff(struct ibmvnic_adapter *adapter, static int reset_long_term_buff(struct ibmvnic_adapter *adapter,