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

Commit f7ba4776 authored by Bart Van Assche's avatar Bart Van Assche Committed by Greg Kroah-Hartman
Browse files

scsi: qla2xxx: Fix qla24xx_process_bidir_cmd() 



[ 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: a9b6f722 ("[SCSI] qla2xxx: Implementation of bidirectional.") # v3.7.
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Tested-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Reviewed-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3245c206

drivers/scsi/qla2xxx/qla_bsg.c

+5 −6
Original line number Diff line number Diff line
@@ -1779,8 +1779,8 @@ qla24xx_process_bidir_cmd(struct bsg_job *bsg_job) 
	uint16_t nextlid = 0;

	uint32_t tot_dsds;

	srb_t *sp = NULL;

	uint32_t req_data_len = 0;

	uint32_t rsp_data_len = 0;

	uint32_t req_data_len;

	uint32_t rsp_data_len;



	/* Check the type of the adapter */

	if (!IS_BIDI_CAPABLE(ha)) {
@@ -1885,6 +1885,9 @@ qla24xx_process_bidir_cmd(struct bsg_job *bsg_job) 
		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) {

		rval = EXT_STATUS_BUSY;

		ql_log(ql_log_warn, vha, 0x70aa,
@@ -1892,10 +1895,6 @@ qla24xx_process_bidir_cmd(struct bsg_job *bsg_job) 
		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 */

	sp = qla2x00_get_sp(vha, &(vha->bidir_fcport), GFP_KERNEL);

	if (!sp) {