From: Eugene Cohen <eugene@hp.com>
Date: Tue, 10 Nov 2015 10:02:24 +0000 (+0000)
Subject: MdeModulePkg PeiCore: Fix issue AuthenticationStatus is not propagated correctly
X-Git-Tag: edk2-stable201903~8601
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=9ddd7d7aec0eb25e078c9ca95329df06b4410169

MdeModulePkg PeiCore: Fix issue AuthenticationStatus is not propagated correctly

This patch fixes an issue in PEI with encapsulated FV images where the
AuthenticationStatus is not correctly propagated down to child FV
handles.  The PEI core registers for callbacks for both FvInfo and
FvInfo2 PPIs.  These callbacks process the FVs which will recurse as
necessary to find more encapsulated FVs.  (FvInfo2 is an updated PPI
that includes an AuthenticationStatus field - the original FvInfo did
not include this.)

When encapsulated FV processing occurs the PEI core installs both
FvInfo and FvInfo2 PPIs.  The original implementation installs FvInfo
first and FvInfo2 second.  As soon as the FvInfo PPI is installed the
notification callback handler immediately fires causing recursive FV
processing to occur.  Since there is no AuthenticationStatus provided
for the original FvInfo the callback assumes AuthenticationStatus is
zero (unsigned / unverified) even though the parent FV may have been
verified.

This changes the order of FvInfo and FvInfo2 installs to ensure that
the notification callback occurs for FvInfo2 first and appropriate
AuthenticationStatus data can be propagated from parent FV to child
FV.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eugene Cohen <eugene@hp.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18764 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/MdeModulePkg/Core/Pei/FwVol/FwVol.c b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
index 363ff7e694..8f6e2efcec 100644
--- a/MdeModulePkg/Core/Pei/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Pei/FwVol/FwVol.c
@@ -1,6 +1,7 @@
 /** @file
   Pei Core Firmware File System service routines.
   
+Copyright (c) 2015 HP Development Company, L.P.
 Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
@@ -1381,22 +1382,24 @@ ProcessFvFile (
   
   //
   // Install FvInfo(2) Ppi
+  // NOTE: FvInfo2 must be installed before FvInfo so that recursive processing of encapsulated
+  // FVs inherit the proper AuthenticationStatus.
   //
-  PeiServicesInstallFvInfoPpi (
+  PeiServicesInstallFvInfo2Ppi(
     &FvHeader->FileSystemGuid,
-    (VOID**) FvHeader,
-    (UINT32) FvHeader->FvLength,
+    (VOID**)FvHeader,
+    (UINT32)FvHeader->FvLength,
     &ParentFvImageInfo.FvName,
-    &FileInfo.FileName
+    &FileInfo.FileName,
+    AuthenticationStatus
     );
 
-  PeiServicesInstallFvInfo2Ppi (
+  PeiServicesInstallFvInfoPpi (
     &FvHeader->FileSystemGuid,
     (VOID**) FvHeader,
     (UINT32) FvHeader->FvLength,
     &ParentFvImageInfo.FvName,
-    &FileInfo.FileName,
-    AuthenticationStatus
+    &FileInfo.FileName
     );
 
   //