aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMark Goodwin <markgw@sgi.com>2005-04-25 13:05:08 -0700
committerTony Luck <tony.luck@intel.com>2005-04-25 13:05:08 -0700
commitf1e2a1c8a1fe16db5f4a7c0c1551d6e1b97dcbb2 (patch)
treeb85b5659b94cdb1f656f11f4761fe0836c011076 /arch
parent4a5c13c7eb0d55bfd2cf3100c55f1e3d8df37576 (diff)
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/sn/kernel/sn2/sn_hwperf.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 3bff99130d5..e731fcb95f9 100644
--- 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);