[SCSI] mpt2sas: Sanity check for phy count is added using max phy count

Fix oops loading driver when there is direct attached
SEP device

The driver set max phys count to the value reported in sas iounit page
zero.  However this page doesn't take into account additional virutal
phys.  When sas topology event arrives, the phy count is larger than
expected, and the driver accesses memory array beyond the end of
allocated space, then oops.  Manufacturing page 8 contains the info
on direct attached phys.

For this fix will making sure that sas topology event is not
processing phys greater than the expected phy count.

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
index 608e8ce6cc7410e15df33763084808015980169d..a68798350ec83f46171f6b700266a7ec04017411 100644 (file)
--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
@@ -4796,7 +4796,7 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,
        int i;
        u16 parent_handle, handle;
        u16 reason_code;
-       u8 phy_number;
+       u8 phy_number, max_phys;
        struct _sas_node *sas_expander;
        struct _sas_device *sas_device;
        u64 sas_address;
@@ -4834,11 +4834,13 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,
        sas_expander = mpt2sas_scsih_expander_find_by_handle(ioc,
            parent_handle);
        spin_unlock_irqrestore(&ioc->sas_node_lock, flags);
-       if (sas_expander)
+       if (sas_expander) {
                sas_address = sas_expander->sas_address;
-       else if (parent_handle < ioc->sas_hba.num_phys)
+               max_phys = sas_expander->num_phys;
+       } else if (parent_handle < ioc->sas_hba.num_phys) {
                sas_address = ioc->sas_hba.sas_address;
-       else
+               max_phys = ioc->sas_hba.num_phys;
+       } else
                return;
 
        /* handle siblings events */
@@ -4852,6 +4854,8 @@ _scsih_sas_topology_change_event(struct MPT2SAS_ADAPTER *ioc,
                    ioc->pci_error_recovery)
                        return;
                phy_number = event_data->StartPhyNum + i;
+               if (phy_number >= max_phys)
+                       continue;
                reason_code = event_data->PHY[i].PhyStatus &
                    MPI2_EVENT_SAS_TOPO_RC_MASK;
                if ((event_data->PHY[i].PhyStatus &