[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;

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/

[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;
 	}
 

[PATCH 0/2] Series short description

[Alan Cox]

Next couple of fixes. The pty one is a bit more dramatic than I wanted for
an -rc release but it actually fixes the problem and at this point seems lower
risk than trying to botch up the existing code temporarily.

Having applied thar you can also then revert
a6540f731d506d9e82444cf0020e716613d4c46c

There are some USB patches to follow to fix various messes caused by sysrq
changes (serious performance regression and a kref leak) but I want those in
-next for a few days first.

---

Alan Cox (2):
      tty: maintainers data was edited wrongly by someone
      pty: Rework the pty layer to use the normal buffering logic


 MAINTAINERS        |   10 ++-
 drivers/char/pty.c |  156 ++++++++++++++++++++--------------------------------
 2 files changed, 65 insertions(+), 101 deletions(-)

-- 
My telephone support is a table

[PATCH 0/2] Series short description

[Alan Cox]

Various i8k updates got lost but have now been chased up, signed off and
this adds them to the tree.
---

Andy Spencer (1):
      i8k: Enable i8k on Dell Precision Systems

Federico Heinz (1):
      i8k: Add Dell Vostro systems


 drivers/char/i8k.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

-- 

[PATCH 0/2] Series short description

[Alan Cox]

A pair of small fixes for nasty console related bugs from the various tty
merges and updates.

Alan