[Patch V2 edk2-stable202208 1/1] BaseTools/Source/C/GenSec: Fix EFI_SECTION_FREEFORM_SUBTYPE_GUID header

[Patch V2 edk2-stable202208 1/1] BaseTools/Source/C/GenSec: Fix EFI_SECTION_FREEFORM_SUBTYPE_GUID header

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4021

When the size of a EFI_SECTION_FREEFORM_SUBTYPE_GUID section required
the use of EFI_FREEFORM_SUBTYPE_GUID_SECTION2 header, set the section
type to EFI_SECTION_FREEFORM_SUBTYPE_GUID.

Cc: Leif Lindholm <llindhol@qti.qualcomm.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Konstantin Aladyshev <aladyshev22@gmail.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Acked-by: Konstantin Aladyshev <aladyshev22@gmail.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/C/GenSec/GenSec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
index d86cc197cc26..a4c2d19aa6f4 100644
--- a/BaseTools/Source/C/GenSec/GenSec.c
+++ b/BaseTools/Source/C/GenSec/GenSec.c
@@ -1112,7 +1112,7 @@ Routine Description:
   //
   if (TotalLength >= MAX_SECTION_SIZE) {
     SubtypeGuidSect2 = (EFI_FREEFORM_SUBTYPE_GUID_SECTION2 *) FileBuffer;
-    SubtypeGuidSect2->CommonHeader.Type     = EFI_SECTION_GUID_DEFINED;
+    SubtypeGuidSect2->CommonHeader.Type     = EFI_SECTION_FREEFORM_SUBTYPE_GUID;
     SubtypeGuidSect2->CommonHeader.Size[0]  = (UINT8) 0xff;
     SubtypeGuidSect2->CommonHeader.Size[1]  = (UINT8) 0xff;
     SubtypeGuidSect2->CommonHeader.Size[2]  = (UINT8) 0xff;
-- 
2.37.1.windows.1

Re: [Patch V2 edk2-stable202208 1/1] BaseTools/Source/C/GenSec: Fix EFI_SECTION_FREEFORM_SUBTYPE_GUID header

[Leif Lindholm]

Posting from the "wrong" email:
Apologies. As some of you might have noticed, I have had email issues recently,
which wasn't helped by them starting while I was away for 4 weeks.

This looks like a clear bugfix to me. I'm happy for it being included in the stable tag.

/
    Leif

> -----Original Message-----
> From: Michael D Kinney <michael.d.kinney@intel.com>
> Sent: 17 August 2022 18:43
> To: devel@edk2.groups.io
> Cc: Leif Lindholm <llindhol@qti.qualcomm.com>; Andrew Fish
> <afish@apple.com>; Konstantin Aladyshev <aladyshev22@gmail.com>; Bob
> Feng <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>;
> Yuwei Chen <yuwei.chen@intel.com>
> Subject: [Patch V2 edk2-stable202208 1/1] BaseTools/Source/C/GenSec: Fix
> EFI_SECTION_FREEFORM_SUBTYPE_GUID header
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4021
> 
> When the size of a EFI_SECTION_FREEFORM_SUBTYPE_GUID section
> required
> the use of EFI_FREEFORM_SUBTYPE_GUID_SECTION2 header, set the
> section
> type to EFI_SECTION_FREEFORM_SUBTYPE_GUID.
> 
> Cc: Leif Lindholm <llindhol@qti.qualcomm.com>
> Cc: Andrew Fish <afish@apple.com>
> Cc: Konstantin Aladyshev <aladyshev22@gmail.com>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> Acked-by: Konstantin Aladyshev <aladyshev22@gmail.com>
> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
> ---
>  BaseTools/Source/C/GenSec/GenSec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/C/GenSec/GenSec.c
> b/BaseTools/Source/C/GenSec/GenSec.c
> index d86cc197cc26..a4c2d19aa6f4 100644
> --- a/BaseTools/Source/C/GenSec/GenSec.c
> +++ b/BaseTools/Source/C/GenSec/GenSec.c
> @@ -1112,7 +1112,7 @@ Routine Description:
>    //
>    if (TotalLength >= MAX_SECTION_SIZE) {
>      SubtypeGuidSect2 = (EFI_FREEFORM_SUBTYPE_GUID_SECTION2 *)
> FileBuffer;
> -    SubtypeGuidSect2->CommonHeader.Type     =
> EFI_SECTION_GUID_DEFINED;
> +    SubtypeGuidSect2->CommonHeader.Type     =
> EFI_SECTION_FREEFORM_SUBTYPE_GUID;
>      SubtypeGuidSect2->CommonHeader.Size[0]  = (UINT8) 0xff;
>      SubtypeGuidSect2->CommonHeader.Size[1]  = (UINT8) 0xff;
>      SubtypeGuidSect2->CommonHeader.Size[2]  = (UINT8) 0xff;
> --
> 2.37.1.windows.1