From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mx.groups.io with SMTP id smtpd.web08.4533.1667179470515970436 for ; Sun, 30 Oct 2022 18:24:31 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: huawei.com, ip: 45.249.212.188, mailfrom: xiewenyi2@huawei.com) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N0wRG4t6LzHvK4; Mon, 31 Oct 2022 09:24:10 +0800 (CST) Received: from kwepemm600004.china.huawei.com (7.193.23.242) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 31 Oct 2022 09:24:27 +0800 Received: from [10.174.253.58] (10.174.253.58) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 31 Oct 2022 09:24:26 +0800 Subject: Re: [PATCH EDK2 v1 1/1] ArmPlatformPkg/Drivers/NorFlashDxe:avoid index out of bound To: Ard Biesheuvel CC: , , , References: <20221029092854.3377294-1-xiewenyi2@huawei.com> <20221029092854.3377294-2-xiewenyi2@huawei.com> From: "wenyi,xie" Message-ID: <4fc090f5-177e-fd67-4790-cf7a79827bc4@huawei.com> Date: Mon, 31 Oct 2022 09:24:22 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.0.1 MIME-Version: 1.0 In-Reply-To: X-Originating-IP: [10.174.253.58] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 7bit On 2022/10/30 18:06, Ard Biesheuvel wrote: > On Sat, 29 Oct 2022 at 11:29, Wenyi Xie wrote: >> >> The size of array BlockMap is 1 in struct FirmwareVolumeHeader, but in >> function InitializeFvAndVariableStoreHeaders, BlockMap[1] is been written. > > The size of BlockMap[] is not 1. BlockMap is a flexible array declared > in an old fashioned way, and because the type definition is covered by > the spec, we can not change it. Given that this is established idiom, > compilers don't tend to warn about this. > >> The memory of BlockMap[1] is already allocated, so the code is OK. But >> it is better to use a new point to assign this memory. >> >> Cc: Leif Lindholm >> Cc: Ard Biesheuvel >> Signed-off-by: Wenyi Xie > > Thanks for the patch but this driver is going to be deleted soon so no point. > > There is new version of this driver in OvmfPkg/ but given the above, I > don't think there is anything that needs fixing here. Thank you for your answering, I got your point and so it seems no necessary to change. Best Regards Wenyi > >> --- >> ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvb.c | 10 ++++++++-- >> 1 file changed, 8 insertions(+), 2 deletions(-) >> >> diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvb.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvb.c >> index 0767581308d2..2130e2e76344 100644 >> --- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvb.c >> +++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvb.c >> @@ -47,6 +47,7 @@ InitializeFvAndVariableStoreHeaders ( >> VOID *Headers; >> UINTN HeadersLength; >> EFI_FIRMWARE_VOLUME_HEADER *FirmwareVolumeHeader; >> + EFI_FV_BLOCK_MAP_ENTRY *BlockMapEntry; >> VARIABLE_STORE_HEADER *VariableStoreHeader; >> UINT32 NvStorageFtwSpareSize; >> UINT32 NvStorageFtwWorkingSize; >> @@ -151,10 +152,15 @@ InitializeFvAndVariableStoreHeaders ( >> FirmwareVolumeHeader->Revision = EFI_FVH_REVISION; >> FirmwareVolumeHeader->BlockMap[0].NumBlocks = Instance->Media.LastBlock + 1; >> FirmwareVolumeHeader->BlockMap[0].Length = Instance->Media.BlockSize; >> - FirmwareVolumeHeader->BlockMap[1].NumBlocks = 0; >> - FirmwareVolumeHeader->BlockMap[1].Length = 0; >> FirmwareVolumeHeader->Checksum = CalculateCheckSum16 ((UINT16 *)FirmwareVolumeHeader, FirmwareVolumeHeader->HeaderLength); >> >> + // >> + // EFI_FV_BLOCK_MAP_ENTRY >> + // >> + BlockMapEntry = (EFI_FV_BLOCK_MAP_ENTRY *)((UINTN)Headers + sizeof (EFI_FIRMWARE_VOLUME_HEADER)); >> + BlockMapEntry->NumBlocks = 0; >> + BlockMapEntry->Length = 0; >> + >> // >> // VARIABLE_STORE_HEADER >> // >> -- >> 2.20.1.windows.1 >> > . >