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

Commit 2dbb02fd authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Avoid that Coverity complains about dereferencing a NULL rport pointer 



Since Coverity cannot know that rport != NULL in qla2xxx_queuecommand() and
since there is code in that function that dereferences the rport pointer,
modify qla2xxx_queuecommand() such that it fails SCSI commands if rport ==
NULL.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent dafbe56f

drivers/scsi/qla2xxx/qla_os.c

+3 −2
Original line number Diff line number Diff line
@@ -859,7 +859,8 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) 
	uint32_t tag;

	uint16_t hwq;



	if (unlikely(test_bit(UNLOADING, &base_vha->dpc_flags))) {

	if (unlikely(test_bit(UNLOADING, &base_vha->dpc_flags)) ||

	    WARN_ON_ONCE(!rport)) {

		cmd->result = DID_NO_CONNECT << 16;

		goto qc24_fail_command;

	}
@@ -982,7 +983,7 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd, 
	srb_t *sp;

	int rval;



	rval = fc_remote_port_chkready(rport);

	rval = rport ? fc_remote_port_chkready(rport) : FC_PORTSTATE_OFFLINE;

	if (rval) {

		cmd->result = rval;

		ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x3076,