scsi: qla2xxx: Fix NULL pointer access for fcport structure

commit 5c25d451163cab9be80744cbc5448d6b95ab8d1a upstream.

when processing iocb in a timeout case, driver was trying to log messages
without verifying if the fcport structure could have valid data. This
results in a NULL pointer access.

Fixes: 726b85487067("qla2xxx: Add framework for async fabric discovery")
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 9603886737b54a21cdb1bb435be76065f9ef7e02..2300c02ab5e698afe23f7ef8edded4c1c4e59e62 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -102,11 +102,16 @@ qla2x00_async_iocb_timeout(void *data)
        struct srb_iocb *lio = &sp->u.iocb_cmd;
        struct event_arg ea;
 
-       ql_dbg(ql_dbg_disc, fcport->vha, 0x2071,
-           "Async-%s timeout - hdl=%x portid=%06x %8phC.\n",
-           sp->name, sp->handle, fcport->d_id.b24, fcport->port_name);
+       if (fcport) {
+               ql_dbg(ql_dbg_disc, fcport->vha, 0x2071,
+                   "Async-%s timeout - hdl=%x portid=%06x %8phC.\n",
+                   sp->name, sp->handle, fcport->d_id.b24, fcport->port_name);
 
-       fcport->flags &= ~FCF_ASYNC_SENT;
+               fcport->flags &= ~FCF_ASYNC_SENT;
+       } else {
+               pr_info("Async-%s timeout - hdl=%x.\n",
+                   sp->name, sp->handle);
+       }
 
        switch (sp->type) {
        case SRB_LOGIN_CMD: