Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763896AbZCaXfB (ORCPT ); Tue, 31 Mar 2009 19:35:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763992AbZCaXVi (ORCPT ); Tue, 31 Mar 2009 19:21:38 -0400 Received: from sous-sol.org ([216.99.217.87]:33276 "EHLO x200.localdomain" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1763907AbZCaXVg (ORCPT ); Tue, 31 Mar 2009 19:21:36 -0400 Message-Id: <20090331231651.420308696@sous-sol.org> User-Agent: quilt/0.47-1 Date: Tue, 31 Mar 2009 16:11:16 -0700 From: Chris Wright To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Russell King Subject: [patch 31/45] ARM: fix leak in iop13xx/pci References: <20090331231045.719396245@sous-sol.org> Content-Disposition: inline; filename=arm-fix-leak-in-iop13xx-pci.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1177 Lines: 44 -stable review patch. If anyone has any objections, please let us know. --------------------- From: Alan Cox upstream commit: b23c7a427e4b3764ad686a46de89ab652811c50a Another leak found by Daniel Marjamäki Signed-off-by: Alan Cox Signed-off-by: Russell King Signed-off-by: Chris Wright --- 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; } -- 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/