]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
scsi: qla2xxx: Fix NULL pointer access due to redundant fc_host_port_name call
authorQuinn Tran <quinn.tran@cavium.com>
Thu, 25 May 2017 01:06:19 +0000 (18:06 -0700)
committerShan Hai <shan.hai@oracle.com>
Tue, 28 Nov 2017 13:27:51 +0000 (21:27 +0800)
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>
drivers/scsi/qla2xxx/qla_mbx.c

index 039ce58057dd491e0b705293b32ba15a2b00f12b..9b178d2bc5720f7e30808ab37e4cf38427fe75ca 100644 (file)
@@ -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 {