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

Commit b8f4fe66 authored by Muli Ben-Yehuda's avatar Muli Ben-Yehuda Committed by Andi Kleen
Browse files

[PATCH] Calgary IOMMU: fix error path memleak in calgary_free_tar 



We were freeing the iommu_table and leaking the bitmap pages. Also
rename it to calgary_free_bus, which is more accurate.

Signed-off-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarJon Mason <jdmason@us.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 9f2dc46d

arch/x86_64/kernel/pci-calgary.c

+10 −2
Original line number Diff line number Diff line
@@ -658,11 +658,12 @@ static int __init calgary_setup_tar(struct pci_dev *dev, void __iomem *bbar) 
	return 0;

}



static void __init calgary_free_tar(struct pci_dev *dev)

static void __init calgary_free_bus(struct pci_dev *dev)

{

	u64 val64;

	struct iommu_table *tbl = dev->sysdata;

	void __iomem *target;

	unsigned int bitmapsz;



	target = calgary_reg(tbl->bbar, tar_offset(dev->bus->number));

	val64 = be64_to_cpu(readq(target));
@@ -670,8 +671,15 @@ static void __init calgary_free_tar(struct pci_dev *dev) 
	writeq(cpu_to_be64(val64), target);

	readq(target); /* flush */



	bitmapsz = tbl->it_size / BITS_PER_BYTE;

	free_pages((unsigned long)tbl->it_map, get_order(bitmapsz));

	tbl->it_map = NULL;



	kfree(tbl);

	dev->sysdata = NULL;



	/* Can't free bootmem allocated memory after system is up :-( */

	bus_info[dev->bus->number].tce_space = NULL;

}



static void calgary_watchdog(unsigned long data)
@@ -853,7 +861,7 @@ static int __init calgary_init(void) 
		if (!bus_info[dev->bus->number].tce_space && !translate_empty_slots)

			continue;

		calgary_disable_translation(dev);

		calgary_free_tar(dev);

		calgary_free_bus(dev);

		pci_dev_put(dev);

	}