1 files changed, 10 insertions, 1 deletions
diff --git a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
index 1cee6a9ba0..9355e52ab0 100644
--- a/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
+++ b/MdeModulePkg/Core/Dxe/FwVol/FwVol.c
@@ -45,6 +45,8 @@ FV_DEVICE mFvDevice = {
   NULL,
   NULL,
   { NULL, NULL },
+  0,
+  FALSE,
   0
 };
 
@@ -638,8 +640,15 @@ NotifyFwVolBlock (
       FvDevice->Fvb             = Fvb;
       FvDevice->Handle          = Handle;
       FvDevice->FwVolHeader     = FwVolHeader;
-      FvDevice->Fv.ParentHandle = Fvb->ParentHandle;
       FvDevice->IsFfs3Fv        = CompareGuid (&FwVolHeader->FileSystemGuid, &gEfiFirmwareFileSystem3Guid);
+      FvDevice->Fv.ParentHandle = Fvb->ParentHandle;
+
+      if (Fvb->ParentHandle != NULL) {
+        //
+        // Inherit the authentication status from FVB.
+        //
+        FvDevice->AuthenticationStatus = GetFvbAuthenticationStatus (Fvb);
+      }
       
       if (!EFI_ERROR (FvCheck (FvDevice))) {
         //