evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scsi: qla2xxx: Fix qla24xx_process_bidir_cmd()

Browse source 
[ Upstream commit c29282c65d1cf54daeea63be46243d7f69d72f4d ]

Set the r??_data_len variables before using these instead of after.

This patch fixes the following Coverity complaint:

const: At condition req_data_len != rsp_data_len, the value of req_data_len
must be equal to 0.
const: At condition req_data_len != rsp_data_len, the value of rsp_data_len
must be equal to 0.
dead_error_condition: The condition req_data_len != rsp_data_len cannot be
true.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Fixes: a9b6f722f6 ("[SCSI] qla2xxx: Implementation of bidirectional.") # v3.7.
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Tested-by: Himanshu Madhani <hmadhani@marvell.com>
Reviewed-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Bart Van Assche 2019-08-08 20:01:48 -07:00 • committed by Greg Kroah-Hartman
parent 564e5f3675
commit 3cd216d42c
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/scsi/qla2xxx/qla_bsg.c
View file

@ -1743,8 +1743,8 @@ qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)
uint16_t nextlid = 0; uint16_t nextlid = 0;
uint32_t tot_dsds; uint32_t tot_dsds;
srb_t *sp = NULL; srb_t *sp = NULL;
uint32_t req_data_len = 0; uint32_t req_data_len;
uint32_t rsp_data_len = 0; uint32_t rsp_data_len;
/* Check the type of the adapter */ /* Check the type of the adapter */
if (!IS_BIDI_CAPABLE(ha)) { if (!IS_BIDI_CAPABLE(ha)) {
@ -1849,6 +1849,9 @@ qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)
goto done_unmap_sg; goto done_unmap_sg;
} }
req_data_len = bsg_job->request_payload.payload_len;
rsp_data_len = bsg_job->reply_payload.payload_len;
if (req_data_len != rsp_data_len) { if (req_data_len != rsp_data_len) {
rval = EXT_STATUS_BUSY; rval = EXT_STATUS_BUSY;
ql_log(ql_log_warn, vha, 0x70aa, ql_log(ql_log_warn, vha, 0x70aa,
@ -1856,10 +1859,6 @@ qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)
goto done_unmap_sg; goto done_unmap_sg;
} }
req_data_len = bsg_job->request_payload.payload_len;
rsp_data_len = bsg_job->reply_payload.payload_len;
/* Alloc SRB structure */ /* Alloc SRB structure */
sp = qla2x00_get_sp(vha, &(vha->bidir_fcport), GFP_KERNEL); sp = qla2x00_get_sp(vha, &(vha->bidir_fcport), GFP_KERNEL);
if (!sp) { if (!sp) {