From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753336AbcIBK0V (ORCPT ); Fri, 2 Sep 2016 06:26:21 -0400 Received: from foss.arm.com ([217.140.101.70]:47216 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753073AbcIBK0P (ORCPT ); Fri, 2 Sep 2016 06:26:15 -0400 Date: Fri, 2 Sep 2016 11:26:18 +0100 From: Will Deacon To: Xie Yisheng Cc: mingo@kernel.org, guohanjun@huawei.com, mark.rutland@arm.com, catalin.marinas@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, matt@codeblueprint.co.uk, linux-efi@vger.kernel.org, ard.biesheuvel@linaro.org Subject: Re: [PATCH] arm64/efi: efi_init error handling fix Message-ID: <20160902102618.GC17482@arm.com> References: <1472811519-4897-1-git-send-email-xieyisheng1@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1472811519-4897-1-git-send-email-xieyisheng1@huawei.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote: > From: Yisheng Xie > > There's an early memmap leak in efi_init error path, fix it. > > Signed-off-by: Yisheng Xie > --- > drivers/firmware/efi/arm-init.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Adding linux-efi, Ard and Matt. Please try to CC the relevant people in future. Will > diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c > index c49d50e..5080e40 100644 > --- a/drivers/firmware/efi/arm-init.c > +++ b/drivers/firmware/efi/arm-init.c > @@ -243,8 +243,10 @@ void __init efi_init(void) > "Unexpected EFI_MEMORY_DESCRIPTOR version %ld", > efi.memmap.desc_version); > > - if (uefi_init() < 0) > + if (uefi_init() < 0) { > + early_memunmap(efi.memmap.map, params.mmap_size); > return; > + } > > reserve_regions(); > efi_memattr_init(); > -- > 1.7.12.4 >