1 files changed, 20 insertions, 3 deletions

diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index fb8413aa005f..a876084ee12f 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -1416,12 +1416,29 @@ void fnic_terminate_rport_io(struct fc_rport *rport)
         unsigned long flags;
         struct scsi_cmnd *sc;
         struct scsi_lun fc_lun;
-        struct fc_rport_libfc_priv *rdata = rport->dd_data;
-        struct fc_lport *lport = rdata->local_port;
-        struct fnic *fnic = lport_priv(lport);
+        struct fc_rport_libfc_priv *rdata;
+        struct fc_lport *lport;
+        struct fnic *fnic;
         struct fc_rport *cmd_rport;
         enum fnic_ioreq_state old_ioreq_state;
 
+        if (!rport) {
+                printk(KERN_ERR "fnic_terminate_rport_io: rport is NULL\n");
+                return;
+        }
+        rdata = rport->dd_data;
+
+        if (!rdata) {
+                printk(KERN_ERR "fnic_terminate_rport_io: rdata is NULL\n");
+                return;
+        }
+        lport = rdata->local_port;
+
+        if (!lport) {
+                printk(KERN_ERR "fnic_terminate_rport_io: lport is NULL\n");
+                return;
+        }
+        fnic = lport_priv(lport);
         FNIC_SCSI_DBG(KERN_DEBUG,
                       fnic->lport->host, "fnic_terminate_rport_io called"
                       " wwpn 0x%llx, wwnn0x%llx, rport 0x%p, portid 0x%06x\n",