From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751749AbcKBETD (ORCPT ); Wed, 2 Nov 2016 00:19:03 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:32930 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750698AbcKBETB (ORCPT ); Wed, 2 Nov 2016 00:19:01 -0400 Date: Wed, 2 Nov 2016 07:18:55 +0300 From: Eugene Korenevsky To: linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org Cc: Matt Fleming , Linn Crosetto , Ard Biesheuvel , "H. Peter Anvin" , Thomas Gleixner , Ingo Molnar Subject: [PATCH v2] EFI loader: remove redundant code Message-ID: <20161102041855.GA4479@vnote> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org *e820ext is always NULL in 'alloc_e820ext()' (see the code of 'exit_boot()'). Without loss of generality we can replace freeing with returning EFI_INVALID_PARAMETER. So if the caller would ever incorrectly pass non-NULL *e820ext, he will obtain a returned error code. --- arch/x86/boot/compressed/eboot.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index cc69e37..6cc66c7 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -956,11 +956,8 @@ static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext, size = sizeof(struct setup_data) + sizeof(struct e820entry) * nr_desc; - if (*e820ext) { - efi_call_early(free_pool, *e820ext); - *e820ext = NULL; - *e820ext_size = 0; - } + if (*e820ext) + return EFI_INVALID_PARAMETER; status = efi_call_early(allocate_pool, EFI_LOADER_DATA, size, (void **)e820ext); -- 2.10.2