Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1e2a1c8 authored by Mark Goodwin's avatar Mark Goodwin Committed by Tony Luck
Browse files

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



Fix infinite loop if sn_hwperf_location_to_bpos() fails.

Signed-off-by: default avatarMark Goodwin <markgw@sgi.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 4a5c13c7

arch/ia64/sn/kernel/sn2/sn_hwperf.c

+7 −5
Original line number Diff line number Diff line
@@ -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);