dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

[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>
This commit is contained in:
Mark Goodwin 2005-04-25 13:05:08 -07:00 committed by Tony Luck
parent 4a5c13c7eb
commit f1e2a1c8a1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/ia64/sn/kernel/sn2/sn_hwperf.c
View File

@ -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);