scsi: qla2xxx: Fix warning in qla2x00_async_iocb_timeout()

BugLink: http://bugs.launchpad.net/bugs/1770003
This patch fixes following Smatch warning:

drivers/scsi/qla2xxx/qla_init.c:130 qla2x00_async_iocb_timeout() error: we previously assumed 'fcport' could be null (see line 107)

Fixes: 5c25d451163c ("scsi: qla2xxx: Fix NULL pointer access for fcport structure")
Reported by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Quinn Tran <quinn.tran@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from 7ac0c332f96bb9688560726f5e80c097ed8de59a)
Signed-off-by: Gustavo Walbon <gwalbon@linux.vnet.ibm.com>
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 8983ea671ddc6f3d7fbfbff6c82e70fd23c99a78..48d2244deafe9855297ff576affd176b0e958c45 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -116,6 +116,8 @@ qla2x00_async_iocb_timeout(void *data)
 
        switch (sp->type) {
        case SRB_LOGIN_CMD:
+               if (!fcport)
+                       break;
                /* Retry as needed. */
                lio->u.logio.data[0] = MBS_COMMAND_ERROR;
                lio->u.logio.data[1] = lio->u.logio.flags & SRB_LOGIN_RETRIED ?
@@ -129,6 +131,8 @@ qla2x00_async_iocb_timeout(void *data)
                qla24xx_handle_plogi_done_event(fcport->vha, &ea);
                break;
        case SRB_LOGOUT_CMD:
+               if (!fcport)
+                       break;
                qlt_logo_completion_handler(fcport, QLA_FUNCTION_TIMEOUT);
                break;
        case SRB_CT_PTHRU_CMD: