korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 06:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

scsi: lpfc: Fix lpfc overwrite of sg_cnt field in nvmefc_tgt_fcp_req

Browse Source 
In lpfc_nvmet_prep_fcp_wqe() the line "rsp->sg_cnt = 0" is modifying the
transport's data structure. This may result in the transport believing the
s/g list was already freed, thus may not unmap/free it properly.  Lpfc
driver should not modify the transport data structure.

The zeroing of the sg_cnt is to avoid use of the transport's sgl in a
subsequent loop where the driver builds the necessary requests for the
adapter firmware to complete the IO.

Change LLDD to use a local copy of the transport sg_cnt when building
requests to be passed to the adapter fw.

Link: https://lore.kernel.org/r/20200322181304.37655-4-jsmart2021@gmail.com
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
James Smart 2020-03-22 11:12:55 -07:00 committed by Martin K. Petersen
parent f861f59671
commit e7f4034912
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/scsi/lpfc/lpfc_nvmet.c
View File

@ -2598,7 +2598,7 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba,
union lpfc_wqe128 *wqe; union lpfc_wqe128 *wqe;
struct ulp_bde64 *bde; struct ulp_bde64 *bde;
dma_addr_t physaddr; dma_addr_t physaddr;
int i, cnt; int i, cnt, nsegs;
int do_pbde; int do_pbde;
int xc = 1; int xc = 1;
@ -2629,6 +2629,7 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba,
phba->cfg_nvme_seg_cnt); phba->cfg_nvme_seg_cnt);
return NULL; return NULL;
} }
nsegs = rsp->sg_cnt;
tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private; tgtp = (struct lpfc_nvmet_tgtport *)phba->targetport->private;
nvmewqe = ctxp->wqeq; nvmewqe = ctxp->wqeq;
@ -2868,7 +2869,7 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba,
wqe->fcp_trsp.rsvd_12_15[0] = 0; wqe->fcp_trsp.rsvd_12_15[0] = 0;
/* Use rspbuf, NOT sg list */ /* Use rspbuf, NOT sg list */
rsp->sg_cnt = 0; nsegs = 0;
sgl->word2 = 0; sgl->word2 = 0;
atomic_inc(&tgtp->xmt_fcp_rsp); atomic_inc(&tgtp->xmt_fcp_rsp);
break; break;
@ -2885,7 +2886,7 @@ lpfc_nvmet_prep_fcp_wqe(struct lpfc_hba *phba,
nvmewqe->drvrTimeout = (phba->fc_ratov * 3) + LPFC_DRVR_TIMEOUT; nvmewqe->drvrTimeout = (phba->fc_ratov * 3) + LPFC_DRVR_TIMEOUT;
nvmewqe->context1 = ndlp; nvmewqe->context1 = ndlp;
for_each_sg(rsp->sg, sgel, rsp->sg_cnt, i) { for_each_sg(rsp->sg, sgel, nsegs, i) {
physaddr = sg_dma_address(sgel); physaddr = sg_dma_address(sgel);
cnt = sg_dma_len(sgel); cnt = sg_dma_len(sgel);
sgl->addr_hi = putPaddrHigh(physaddr); sgl->addr_hi = putPaddrHigh(physaddr);