[PATCH] MdeModulePkg PeiCore: Make sure FvInfo has FFS2 format if Ffs2Guid FvFormat

[PATCH] MdeModulePkg PeiCore: Make sure FvInfo has FFS2 format if Ffs2Guid FvFormat

[Star Zeng]

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=160

Cc: Liming Gao <liming.gao@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 MdeModulePkg/Core/Pei/FwVol/FwVol.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 6ca41ee16f4a..554bcc31d976 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -565,6 +565,20 @@ FirmwareVolmeInfoPpiNotifyCallback (
     IsFvInfo2 = FALSE;
   }
 
+  if (CompareGuid (&FvInfo2Ppi.FvFormat, &gEfiFirmwareFileSystem2Guid)) {
+    //
+    // gEfiFirmwareFileSystem2Guid is specified for the FvFormat, then here to check the
+    // FileSystemGuid pointed by FvInfo against gEfiFirmwareFileSystem2Guid to make sure
+    // FvInfo has the firmware file system 2 format.
+    //
+    // If the ASSERT really appears, the FvFormat needs to be specified correctly, for example,
+    // gEfiFirmwareFileSystem3Guid can be used for firmware file system 3 format, or
+    // (((EFI_FIRMWARE_VOLUME_HEADER *) FvInfo)->FileSystemGuid can be just used for both
+    // firmware file system 2 and 3 format.
+    //
+    ASSERT (CompareGuid (&(((EFI_FIRMWARE_VOLUME_HEADER *) FvInfo2Ppi.FvInfo)->FileSystemGuid), &gEfiFirmwareFileSystem2Guid));
+  }
+
   //
   // Locate the corresponding FV_PPI according to founded FV's format guid
   //
-- 
2.7.0.windows.1

Re: [PATCH] MdeModulePkg PeiCore: Make sure FvInfo has FFS2 format if Ffs2Guid FvFormat

[Gao, Liming]

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Zeng, Star
> Sent: Monday, October 24, 2016 5:20 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Gao, Liming <liming.gao@intel.com>;
> Sean Brogan <sean.brogan@microsoft.com>
> Subject: [PATCH] MdeModulePkg PeiCore: Make sure FvInfo has FFS2
> format if Ffs2Guid FvFormat
> 
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=160
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  MdeModulePkg/Core/Pei/FwVol/FwVol.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
> b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
> index 6ca41ee16f4a..554bcc31d976 100644
> --- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
> +++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
> @@ -565,6 +565,20 @@ FirmwareVolmeInfoPpiNotifyCallback (
>      IsFvInfo2 = FALSE;
>    }
> 
> +  if (CompareGuid (&FvInfo2Ppi.FvFormat, &gEfiFirmwareFileSystem2Guid))
> {
> +    //
> +    // gEfiFirmwareFileSystem2Guid is specified for the FvFormat, then here
> to check the
> +    // FileSystemGuid pointed by FvInfo against
> gEfiFirmwareFileSystem2Guid to make sure
> +    // FvInfo has the firmware file system 2 format.
> +    //
> +    // If the ASSERT really appears, the FvFormat needs to be specified
> correctly, for example,
> +    // gEfiFirmwareFileSystem3Guid can be used for firmware file system 3
> format, or
> +    // (((EFI_FIRMWARE_VOLUME_HEADER *) FvInfo)->FileSystemGuid can
> be just used for both
> +    // firmware file system 2 and 3 format.
> +    //
> +    ASSERT (CompareGuid (&(((EFI_FIRMWARE_VOLUME_HEADER *)
> FvInfo2Ppi.FvInfo)->FileSystemGuid), &gEfiFirmwareFileSystem2Guid));
> +  }
> +
>    //
>    // Locate the corresponding FV_PPI according to founded FV's format guid
>    //
> --
> 2.7.0.windows.1