[PATCH 4 of 7] [x86-64] Calgary IOMMU: fix error path memleak in calgary_free_tar

Muli Ben-Yehuda
2006-07-25T16:57:28Z

1 files changed, 10 insertions(+), 2 deletions(-)
arch/x86_64/kernel/pci-calgary.c | 12 ++++++++++--

# HG changeset patch
# User Muli Ben-Yehuda <muli@il.ibm.com>
# Date 1153737408 -10800
# Node ID 7b1cdbc92f2c618cb59feaf472c8b76df875743d
# Parent 4b8fbf25700873a70eff09264e52e9f6c6330c18
[x86-64] 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: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Jon Mason <jdmason@us.ibm.com>

diff -r 4b8fbf257008 -r 7b1cdbc92f2c arch/x86_64/kernel/pci-calgary.c
--- a/arch/x86_64/kernel/pci-calgary.c Mon Jul 24 13:30:03 2006 +0300
+++ b/arch/x86_64/kernel/pci-calgary.c Mon Jul 24 13:36:48 2006 +0300
@@ -658,11 +658,12 @@ static int __init calgary_setup_tar(stru
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(stru
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 @@ error:
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);
}