diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2010-11-06 10:06:49 +0100 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2010-11-08 11:30:00 -0500 |
| commit | 07cf2a64c2ad3408a0e12aa4cd6040b30c09381d (patch) | |
| tree | cd0dcf610b4a83fb3c67ef940e5e391860f19062 /arch/x86 | |
| parent | 1688c3d6000b1183bcb604c8c85f742a579990e5 (diff) | |
| download | linux-stable-07cf2a64c2ad3408a0e12aa4cd6040b30c09381d.tar.gz linux-stable-07cf2a64c2ad3408a0e12aa4cd6040b30c09381d.tar.bz2 linux-stable-07cf2a64c2ad3408a0e12aa4cd6040b30c09381d.zip | |
xen: fix memory leak in Xen PCI MSI/MSI-X allocator.
Stanse found that xen_setup_msi_irqs leaks memory when
xen_allocate_pirq fails. Free the memory in that fail path.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: xen-devel@lists.xensource.com
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/pci/xen.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c index 117f5b8daf75..d7b5109f7a9c 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -147,8 +147,10 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) irq = xen_allocate_pirq(v[i], 0, /* not sharable */ (type == PCI_CAP_ID_MSIX) ? "pcifront-msi-x" : "pcifront-msi"); - if (irq < 0) - return -1; + if (irq < 0) { + ret = -1; + goto free; + } ret = set_irq_msi(irq, msidesc); if (ret) @@ -164,7 +166,7 @@ error: if (ret == -ENODEV) dev_err(&dev->dev, "Xen PCI frontend has not registered" \ " MSI/MSI-X support!\n"); - +free: kfree(v); return ret; } |