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

Commit 089bbbcb authored by Muli Ben-Yehuda's avatar Muli Ben-Yehuda Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Calgary IOMMU - fix off by one error 



Fixed off-by-one error in detect_calgary and calgary_init which will
cause arrays to overflow.  Also, removed impossible to hit BUG_ON.

Signed-off-by: default avatarJon Mason <jdmason@us.ibm.com>
Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0e5f61b0

arch/x86_64/kernel/pci-calgary.c

+3 −4
Original line number Diff line number Diff line
@@ -812,7 +812,7 @@ static int __init calgary_init(void) 
	int i, ret = -ENODEV;

	struct pci_dev *dev = NULL;



	for (i = 0; i <= num_online_nodes() * MAX_NUM_OF_PHBS; i++) {

	for (i = 0; i < num_online_nodes() * MAX_NUM_OF_PHBS; i++) {

		dev = pci_get_device(PCI_VENDOR_ID_IBM,

				     PCI_DEVICE_ID_IBM_CALGARY,

				     dev);
@@ -890,9 +890,8 @@ void __init detect_calgary(void) 
	specified_table_size = determine_tce_table_size(end_pfn * PAGE_SIZE);



	for (bus = 0, table_idx = 0;

	     bus <= num_online_nodes() * MAX_PHB_BUS_NUM;

	     bus < num_online_nodes() * MAX_PHB_BUS_NUM;

	     bus++) {

		BUG_ON(bus > MAX_NUMNODES * MAX_PHB_BUS_NUM);

		if (read_pci_config(bus, 0, 0, 0) != PCI_VENDOR_DEVICE_ID_CALGARY)

			continue;

		if (test_bit(bus, translation_disabled)) {
@@ -1002,7 +1001,7 @@ static int __init calgary_parse_options(char *p) 
			if (p == endp)

				break;



			if (bridge <= (num_online_nodes() * MAX_PHB_BUS_NUM)) {

			if (bridge < (num_online_nodes() * MAX_PHB_BUS_NUM)) {

				printk(KERN_INFO "Calgary: disabling "

				       "translation for PHB 0x%x\n", bridge);

				set_bit(bridge, translation_disabled);