From: Quinn Tran <quinn.tran@cavium.com>
Date: Thu, 25 May 2017 01:06:19 +0000 (-0700)
Subject: scsi: qla2xxx: Fix NULL pointer access due to redundant fc_host_port_name call
X-Git-Tag: v4.1.12-117.0_27200813_3~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=430a61e8ab85a9ba617800f462311250d4323488;p=users%2Fjedix%2Flinux-maple.git

scsi: qla2xxx: Fix NULL pointer access due to redundant fc_host_port_name call

Remove redundant fc_host_port_name calls to prevent early access of
scsi_host->shost_data buffer. This prevent null pointer access.

Following stack trace is seen:

BUG: unable to handle kernel NULL pointer dereference at 00000000000008
IP: qla24xx_report_id_acquisition+0x22d/0x3a0 [qla2xxx]

Cc: <stable@vger.kernel.org> # v4.11+
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 commit 0ea88662b5c6404a8f7af6b040b3cf1f0e8c3a66)

Orabug: 27184882

Signed-off-by: Shan Hai <shan.hai@oracle.com>
Reviewed-by: Ethan Zhao <ethan.zhao@oracle.com>
---

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 039ce58057dd..9b178d2bc572 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -3404,15 +3404,6 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
 				spin_unlock_irqrestore(&ha->vport_slock, flags);
 			}
 
-			fc_host_port_name(vha->host) =
-			    wwn_to_u64(vha->port_name);
-
-			if (qla_ini_mode_enabled(vha))
-				ql_dbg(ql_dbg_mbx, vha, 0x1018,
-				    "FA-WWN portname %016llx (%x)\n",
-				    fc_host_port_name(vha->host),
-				    rptid_entry->vp_status);
-
 			set_bit(REGISTER_FC4_NEEDED, &vha->dpc_flags);
 			set_bit(REGISTER_FDMI_NEEDED, &vha->dpc_flags);
 		} else {