Hi Ray,
I have checked the EFI_FFS_FILE_HEADER, the Size only 3 bytes,
GetFfsFileLength only return 0xFFFFFF. I not found existing macro
typedef struct {
EFI_GUID Name;
EFI_FFS_INTEGRITY_CHECK IntegrityCheck;
EFI_FV_FILETYPE Type;
EFI_FFS_FILE_ATTRIBUTES Attributes;
UINT8 Size[3];
EFI_FFS_FILE_STATE State;
} EFI_FFS_FILE_HEADER
-----Original Message-----
From: Ni, Ray <ray...@intel.com>
Sent: Saturday, May 9, 2020 10:46 AM
To: devel@edk2.groups.io; Feng, YunhuaX <yunhuax.f...@intel.com>
Cc: Feng, Bob C <bob.c.f...@intel.com>; Gao, Liming <liming....@intel.com>
Subject: RE: [edk2-staging][PATCH] BaseTools/Fmmt: Fix found the next FFS issue
Yunhua,
Why the comparison is against 0xFFFFFF not 0xFFFFFFFF?
Is there any existing macro that you can use?
Thanks,
Ray
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Feng, YunhuaX
> Sent: Saturday, May 9, 2020 9:59 AM
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.f...@intel.com>; Gao, Liming <liming....@intel.com>
> Subject: [edk2-devel] [edk2-staging][PATCH] BaseTools/Fmmt: Fix found the
> next FFS issue
>
> if found the next FFS size equal 0xFFFFFF, return NOT_FOUND
>
> Cc: Bob Feng <bob.c.f...@intel.com>
> Cc: Liming Gao <liming....@intel.com>
>
> Signed-off-by: Yunhua Feng <yunhuax.f...@intel.com>
> ---
> BaseTools/Source/C/FMMT/FmmtLib.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c
> b/BaseTools/Source/C/FMMT/FmmtLib.c
> index cdbee3d629..4fb10ecfe6 100644
> --- a/BaseTools/Source/C/FMMT/FmmtLib.c
> +++ b/BaseTools/Source/C/FMMT/FmmtLib.c
> @@ -1769,10 +1769,13 @@ FvBufFindNextFile (
> (*Key + sizeof (*fhdr)) < fvSize;
> *Key = (UINTN)ALIGN_POINTER (*Key, 8)
> ) {
> fhdr = (EFI_FFS_FILE_HEADER*) ((UINT8*)hdr + *Key);
> fsize = GetFfsFileLength (fhdr);
> + if (fsize == 0xffffff) {
> + break;
> + }
> if (!EFI_TEST_FFS_ATTRIBUTES_BIT(
> FvbAttributes,
> fhdr->State,
> EFI_FILE_HEADER_VALID
> ) ||
> --
> 2.12.2.windows.2
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#58940): https://edk2.groups.io/g/devel/message/58940
Mute This Topic: https://groups.io/mt/74088407/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
