[PATCH 0/2] Series short description

[PATCH 0/2] Series short description

[Alan Cox]

Fix up a couple of leaks that were reported ages ago and forgotten about

---

Alan Cox (2):
      arm: fix leak in iop13xx/pci
      arm: twl4030 - leak fix


 arch/arm/mach-iop13xx/pci.c       |    5 ++++-
 arch/arm/mach-omap2/mmc-twl4030.c |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)

-- 
	"That was said by Eric Raymond who belongs to another movement" 
			- Richard Stallman

[PATCH 1/2] arm: twl4030 - leak fix

[Alan Cox]

Trivial error path leak fix. Problem found by Daniel Marjamäki using
cppcheck

Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
---

 arch/arm/mach-omap2/mmc-twl4030.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
index 437f520..e1dadf7 100644
--- a/arch/arm/mach-omap2/mmc-twl4030.c
+++ b/arch/arm/mach-omap2/mmc-twl4030.c
@@ -397,6 +397,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
 			break;
 		default:
 			pr_err("MMC%d configuration not supported!\n", c->mmc);
+			kfree(mmc);
 			continue;
 		}
 		hsmmc_data[c->mmc - 1] = mmc;

[PATCH 2/2] arm: fix leak in iop13xx/pci

[Alan Cox]

Another leak found by Daniel Marjamäki

Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
---

 arch/arm/mach-iop13xx/pci.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c
index 673b0db..4873f26 100644
--- 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_sys_data *sys)
 		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_data *sys)
 		sys->map_irq = iop13xx_pcie_map_irq;
 		break;
 	default:
+		kfree(res);
 		return 0;
 	}
 

Re: [PATCH 1/2] arm: twl4030 - leak fix

[Tony Lindgren]

* Alan Cox <alan@lxorguk.ukuu.org.uk> [090323 03:45]:
> Trivial error path leak fix. Problem found by Daniel Marjamäki using
> cppcheck
> 
> Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>

Acked-by: Tony Lindgren <tony@atomide.com>

> ---
> 
>  arch/arm/mach-omap2/mmc-twl4030.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> 
> diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c
> index 437f520..e1dadf7 100644
> --- a/arch/arm/mach-omap2/mmc-twl4030.c
> +++ b/arch/arm/mach-omap2/mmc-twl4030.c
> @@ -397,6 +397,7 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers)
>  			break;
>  		default:
>  			pr_err("MMC%d configuration not supported!\n", c->mmc);
> +			kfree(mmc);
>  			continue;
>  		}
>  		hsmmc_data[c->mmc - 1] = mmc;
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/