Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936484AbcJRPbu (ORCPT ); Tue, 18 Oct 2016 11:31:50 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49806 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936414AbcJRPb3 (ORCPT ); Tue, 18 Oct 2016 11:31:29 -0400 Date: Tue, 18 Oct 2016 08:29:16 -0700 From: tip-bot for Yisheng Xie Message-ID: Cc: tglx@linutronix.de, peterz@infradead.org, mingo@kernel.org, ard.biesheuvel@linaro.org, will.deacon@arm.com, mark.rutland@arm.com, matt@codeblueprint.co.uk, catalin.marinas@arm.com, hpa@zytor.com, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, xieyisheng1@huawei.com Reply-To: torvalds@linux-foundation.org, xieyisheng1@huawei.com, matt@codeblueprint.co.uk, mark.rutland@arm.com, will.deacon@arm.com, ard.biesheuvel@linaro.org, linux-kernel@vger.kernel.org, hpa@zytor.com, catalin.marinas@arm.com, tglx@linutronix.de, mingo@kernel.org, peterz@infradead.org In-Reply-To: <20161018143318.15673-4-matt@codeblueprint.co.uk> References: <20161018143318.15673-4-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi/arm*: Fix efi_init() error handling Git-Commit-ID: 0709a008c9fadc176500ece7395b8b5b8de143e3 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1541 Lines: 43 Commit-ID: 0709a008c9fadc176500ece7395b8b5b8de143e3 Gitweb: http://git.kernel.org/tip/0709a008c9fadc176500ece7395b8b5b8de143e3 Author: Yisheng Xie AuthorDate: Tue, 18 Oct 2016 15:33:13 +0100 Committer: Ingo Molnar CommitDate: Tue, 18 Oct 2016 17:11:17 +0200 efi/arm*: Fix efi_init() error handling There's an early memmap() leak in the efi_init() error path, fix it. Signed-off-by: Yisheng Xie Signed-off-by: Matt Fleming Cc: Ard Biesheuvel Cc: Catalin Marinas Cc: Linus Torvalds Cc: Mark Rutland Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Will Deacon Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20161018143318.15673-4-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- drivers/firmware/efi/arm-init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c index 8efe130..f853ad2 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c @@ -244,8 +244,10 @@ void __init efi_init(void) "Unexpected EFI_MEMORY_DESCRIPTOR version %ld", efi.memmap.desc_version); - if (uefi_init() < 0) + if (uefi_init() < 0) { + efi_memmap_unmap(); return; + } reserve_regions(); efi_memattr_init();