2009-03-31 23:35:01

by Chris Wright

[permalink] [raw]
Subject: [patch 31/45] ARM: fix leak in iop13xx/pci

-stable review patch. If anyone has any objections, please let us know.
---------------------

From: Alan Cox <[email protected]>

upstream commit: b23c7a427e4b3764ad686a46de89ab652811c50a

Another leak found by Daniel Marjamäki

Signed-off-by: Alan Cox <[email protected]>
Signed-off-by: Russell King <[email protected]>
Signed-off-by: Chris Wright <[email protected]>
---
arch/arm/mach-iop13xx/pci.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

--- a/arch/arm/mach-iop13xx/pci.c
+++ b/arch/arm/mach-iop13xx/pci.c
@@ -1026,8 +1026,10 @@ int iop13xx_pci_setup(int nr, struct pci
which_atu = 0;
}

- if (!which_atu)
+ if (!which_atu) {
+ kfree(res);
return 0;
+ }

switch(which_atu) {
case IOP13XX_INIT_ATU_ATUX:
@@ -1074,6 +1076,7 @@ int iop13xx_pci_setup(int nr, struct pci
sys->map_irq = iop13xx_pcie_map_irq;
break;
default:
+ kfree(res);
return 0;
}