From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S932804AbcIELMp (ORCPT <rfc822;w@1wt.eu>);
        Mon, 5 Sep 2016 07:12:45 -0400
Received: from szxga02-in.huawei.com ([119.145.14.65]:49019 "EHLO
        szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S932299AbcIELMm (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 5 Sep 2016 07:12:42 -0400
Subject: Re: [PATCH] arm64/efi: efi_init error handling fix
To: Will Deacon <will.deacon@arm.com>
References: <1472811519-4897-1-git-send-email-xieyisheng1@huawei.com>
 <20160902102618.GC17482@arm.com>
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>
From: Yisheng Xie <xieyisheng1@huawei.com>
Message-ID: <d8689621-2dc3-ccf8-c33b-68f0d6eab66b@huawei.com>
Date: Mon, 5 Sep 2016 19:11:59 +0800
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.1.0
MIME-Version: 1.0
In-Reply-To: <20160902102618.GC17482@arm.com>
Content-Type: text/plain; charset="windows-1252"
Content-Transfer-Encoding: 7bit
X-Originating-IP: [10.177.32.149]
X-CFilter-Loop: Reflected
X-Mirapoint-Virus-RAPID-Raw: score=unknown(0),
        refid=str=0001.0A020204.57CD5318.00DC,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0,
        ip=0.0.0.0,
        so=2013-06-18 04:22:30,
        dmn=2013-03-21 17:37:32
X-Mirapoint-Loop-Id: f363603598c7d8993a55c99e171c320e
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi all,
Could someone help to give some comments?
Really thanks for that.

Thanks.
Xie Yisheng

On 2016/9/2 18:26, Will Deacon wrote:
> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
>> From: Yisheng Xie <xieyisheng1@huawei.com>
>>
>> There's an early memmap leak in efi_init error path, fix it.
>>
>> Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
>> ---
>>  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.
> 
Hi Will,
Thank you for your kind help. I will do more check about who to CC next time.

Thanks.

> 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
>>
> 
> .
>