[IA64-SGI] Altix SN topology fix potential infinite loop

Fix infinite loop if sn_hwperf_location_to_bpos() fails.

Signed-off-by: Mark Goodwin <markgw@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 3bff99130d5e4a2a0df31f153da325ee5bcdd5b4..e731fcb95f904e78e08fdc8c09780b2d1136c511 100644 (file)
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -300,14 +300,15 @@ static int sn_topology_show(struct seq_file *s, void *d)
                 * PCI busses attached to this node, if any
                 */
                do {
-                       if (!(pci_topo_buf = vmalloc(pci_topo_buf_len))) {
-                               printk("sn_topology_show: kmalloc failed\n");
+                       if (sn_hwperf_location_to_bpos(obj->location,
+                               &rack, &bay, &slot, &slab)) {
                                break;
                        }
 
-                       if (sn_hwperf_location_to_bpos(obj->location,
-                               &rack, &bay, &slot, &slab) != 0)
-                               continue;
+                       if (!(pci_topo_buf = vmalloc(pci_topo_buf_len))) {
+                               printk("sn_topology_show: vmalloc failed\n");
+                               break;
+                       }
 
                        e = ia64_sn_ioif_get_pci_topology(rack, bay, slot, slab,
                                pci_topo_buf, pci_topo_buf_len);
@@ -325,6 +326,7 @@ static int sn_topology_show(struct seq_file *s, void *d)
                                break;
 
                        case SN_HWPERF_OP_OK:
+                       default:
                                /* export pci bus info */
                                print_pci_topology(s, obj, &pci_bus_ordinal,
                                        pci_topo_buf, pci_topo_buf_len);