From nobody Mon May 6 16:24:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+95718+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+95718+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1667035746; cv=none; d=zohomail.com; s=zohoarc; b=f/dAeAn7yPVyNWRnvV1UFrATM1E8szQ7lzmayaUXCGq0WCDI+hoItbGFLjnHpwRfR9JBuRyNnN4Dj4y3Hg1YI3zd9eqzxsr2GGoiHyxHIGS3+db7wBXhLUE3ZkPY4YqVbnzpwZC/p50Vc4RY70zGRqHa/ak6Qz1SrWpviasBxMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667035746; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=GGacg8c8c3jI5sCMaOjqPae17FRJPt3rIwOC5j1Xvs0=; b=JWJdtjWjVTDudR6WZxli+rnCeimsqohA1W6efjzk98FoFzQ7K5XAsH/KWqRYfAZQioMGy6sMW/LyP5KnvQqNLZ263FZ6qXJOGfQdAgHBtJDXMU0D89xnq+/oOhWqQJyYMdsffvm0G9keAj6LpYRBEtvTqw6Y8dZ1MHqvCcZaquQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+95718+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1667035746629457.79343121729846; Sat, 29 Oct 2022 02:29:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id QuhrYY1788612xfZy19G6gm8; Sat, 29 Oct 2022 02:29:06 -0700 X-Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mx.groups.io with SMTP id smtpd.web10.1781.1667035744968008214 for ; Sat, 29 Oct 2022 02:29:05 -0700 X-Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4MzvHL6vmGzHvJ7; Sat, 29 Oct 2022 17:28:46 +0800 (CST) X-Received: from kwepemm600004.china.huawei.com (7.193.23.242) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 29 Oct 2022 17:29:02 +0800 X-Received: from kwephisprg16640.huawei.com (10.247.83.252) 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; Sat, 29 Oct 2022 17:29:01 +0800 From: "wenyi,xie via groups.io" To: , , CC: , Subject: [edk2-devel] [PATCH EDK2 v1 1/1] ArmPlatformPkg/Drivers/NorFlashDxe:avoid index out of bound Date: Sat, 29 Oct 2022 17:28:54 +0800 Message-ID: <20221029092854.3377294-2-xiewenyi2@huawei.com> In-Reply-To: <20221029092854.3377294-1-xiewenyi2@huawei.com> References: <20221029092854.3377294-1-xiewenyi2@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.247.83.252] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,xiewenyi2@huawei.com X-Gm-Message-State: kqxkyvo6s3u4eIJISjlrqRMDx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1667035746; bh=YgnlqY7IlAcl80tTZWX/oonQqyghSlkxRWhhfyT8Mcc=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=R0SjCCtIW3AJLVN4A3gBBynot6a/ohDHHuPWJ+D3VMoXG7RFKcsFCDbsr1JnhJ0MwFa oTPt2mbznActiofjL1hXt+w0QgfBrWluUv3llP19bv/nzhEzHP3HevcytFV8hPB9ge+tH io1lrx9XL+CMc71NP4qbeaBxRZZzWsWcwVg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1667035747574100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The size of array BlockMap is 1 in struct FirmwareVolumeHeader, but in function InitializeFvAndVariableStoreHeaders, BlockMap[1] is been written. 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 --- ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvb.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashFvb.c b/ArmPlatform= Pkg/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 =3D EFI_FVH_REVISION; FirmwareVolumeHeader->BlockMap[0].NumBlocks =3D Instance->Media.LastBloc= k + 1; FirmwareVolumeHeader->BlockMap[0].Length =3D Instance->Media.BlockSiz= e; - FirmwareVolumeHeader->BlockMap[1].NumBlocks =3D 0; - FirmwareVolumeHeader->BlockMap[1].Length =3D 0; FirmwareVolumeHeader->Checksum =3D CalculateCheckSum16 ((UI= NT16 *)FirmwareVolumeHeader, FirmwareVolumeHeader->HeaderLength); =20 + // + // EFI_FV_BLOCK_MAP_ENTRY + // + BlockMapEntry =3D (EFI_FV_BLOCK_MAP_ENTRY *)((UINTN)Headers += sizeof (EFI_FIRMWARE_VOLUME_HEADER)); + BlockMapEntry->NumBlocks =3D 0; + BlockMapEntry->Length =3D 0; + // // VARIABLE_STORE_HEADER // --=20 2.20.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#95718): https://edk2.groups.io/g/devel/message/95718 Mute This Topic: https://groups.io/mt/94644092/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-