> -----Original Message-----
> From: Kun Qin <[email protected]>
> Sent: Thursday, June 10, 2021 9:43 AM
> To: [email protected]
> Cc: Wang, Jian J <[email protected]>; Wu, Hao A <[email protected]>;
> Dong, Eric <[email protected]>; Ni, Ray <[email protected]>
> Subject: [PATCH v1 4/5] MdeModulePkg: SmiHandlerProfileInfo: Updated
> MessageLength calculation
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3398
>
> This change replaced the calculation of communication buffer size from
> explicitly adding the size of each member with the OFFSET macro function.
> This will make the structure field defition change transparent to consumers.
>
> Cc: Jian J Wang <[email protected]>
> Cc: Hao A Wu <[email protected]>
> Cc: Eric Dong <[email protected]>
> Cc: Ray Ni <[email protected]>
>
> Signed-off-by: Kun Qin <[email protected]>
> ---
> MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo.c
> | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git
> a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo
> .c
> b/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo
> .c
> index 4153074b7a80..56d80d1a9ce1 100644
> ---
> a/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileInfo
> .c
> +++
> b/MdeModulePkg/Application/SmiHandlerProfileInfo/SmiHandlerProfileIn
> +++ fo.c
> @@ -116,7 +116,9 @@ GetSmiHandlerProfileDatabase(
> CommGetInfo->Header.ReturnStatus = (UINT64)-1;
> CommGetInfo->DataSize = 0;
>
> - CommSize = sizeof(EFI_GUID) + sizeof(UINTN) + CommHeader-
> >MessageLength;
> + // BZ3398: Make MessageLength the same size in
> EFI_MM_COMMUNICATE_HEADER for both IA32 and X64.
Similar comments as in patch 3/5.
Best Regards,
Hao Wu
> + // The CommHeader->MessageLength contains a definitive value, thus
> UINTN cast is safe here.
> + CommSize = OFFSET_OF(EFI_SMM_COMMUNICATE_HEADER, Data) +
> + (UINTN)CommHeader->MessageLength;
> Status = SmmCommunication->Communicate(SmmCommunication,
> CommBuffer, &CommSize);
> if (EFI_ERROR(Status)) {
> Print(L"SmiHandlerProfile: SmmCommunication - %r\n", Status); @@ -
> 149,7 +151,9 @@ GetSmiHandlerProfileDatabase(
> CommGetData->Header.DataLength = sizeof(*CommGetData);
> CommGetData->Header.ReturnStatus = (UINT64)-1;
>
> - CommSize = sizeof(EFI_GUID) + sizeof(UINTN) + CommHeader-
> >MessageLength;
> + // BZ3398: Make MessageLength the same size in
> EFI_MM_COMMUNICATE_HEADER for both IA32 and X64.
> + // The CommHeader->MessageLength contains a definitive value, thus
> UINTN cast is safe here.
> + CommSize = OFFSET_OF(EFI_SMM_COMMUNICATE_HEADER, Data) +
> + (UINTN)CommHeader->MessageLength;
> Buffer = (UINT8 *)CommHeader + CommSize;
> Size -= CommSize;
>
> --
> 2.31.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#76372): https://edk2.groups.io/g/devel/message/76372
Mute This Topic: https://groups.io/mt/83435925/21656
Group Owner: [email protected]
Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
