From ffccb935fab8103ab4efef1d9f949aeb581c83df Mon Sep 17 00:00:00 2001
From: "Dong, Guo" <guo.dong@intel.com>
Date: Wed, 25 Jun 2014 02:02:22 +0000
Subject: Update code to always publish EFI_IMAGE_EXECUTION_INFO_TABLE.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dong, Guo <guo.dong@intel.com>
Reviewed-by: Fu, Siyuan <siyuan.fu@intel.com>
Reviewed-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: Zhang, Chao B <chao.b.zhang@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15585 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../DxeImageVerificationLib.c                      | 51 +++++++++++++++++++++-
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
index 2210c95f5a..9f2bd68299 100644
--- a/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
+++ b/SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.c
@@ -12,7 +12,7 @@
   DxeImageVerificationHandler(), HashPeImageByType(), HashPeImage() function will accept
   untrusted PE/COFF image and validate its data structure within this image buffer before use.
 
-Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2009 - 2014, 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
 which accompanies this distribution.  The full text of the license may be found at
@@ -768,7 +768,7 @@ AddImageExeInfo (
   NewImageExeInfoTable->NumberOfImages++;
   ImageExeInfoEntry = (EFI_IMAGE_EXECUTION_INFO *) ((UINT8 *) NewImageExeInfoTable + ImageExeInfoTableSize);
   //
-  // Update new item's infomation.
+  // Update new item's information.
   //
   WriteUnaligned32 ((UINT32 *) &ImageExeInfoEntry->Action, Action);
   WriteUnaligned32 ((UINT32 *) &ImageExeInfoEntry->InfoSize, (UINT32) NewImageExeInfoEntrySize);
@@ -1377,6 +1377,41 @@ Done:
   return Status;
 }
 
+/**
+  On Ready To Boot Services Event notification handler.
+
+  Add the image execution information table if it is not in system configuration table.
+
+  @param[in]  Event     Event whose notification function is being invoked
+  @param[in]  Context   Pointer to the notification function's context
+
+**/
+VOID
+EFIAPI
+OnReadyToBoot (
+  IN      EFI_EVENT               Event,
+  IN      VOID                    *Context
+  )
+{
+  EFI_IMAGE_EXECUTION_INFO_TABLE  *ImageExeInfoTable;
+  UINTN                           ImageExeInfoTableSize;
+
+  EfiGetSystemConfigurationTable (&gEfiImageSecurityDatabaseGuid, (VOID **) &ImageExeInfoTable);
+  if (ImageExeInfoTable != NULL) {
+    return;
+  }
+
+  ImageExeInfoTableSize = sizeof (EFI_IMAGE_EXECUTION_INFO_TABLE);
+  ImageExeInfoTable     = (EFI_IMAGE_EXECUTION_INFO_TABLE *) AllocateRuntimePool (ImageExeInfoTableSize);
+  if (ImageExeInfoTable == NULL) {
+    return ;
+  }
+
+  ImageExeInfoTable->NumberOfImages = 0;  
+  gBS->InstallConfigurationTable (&gEfiImageSecurityDatabaseGuid, (VOID *) ImageExeInfoTable);
+
+}
+
 /**
   Register security measurement handler.
 
@@ -1392,6 +1427,18 @@ DxeImageVerificationLibConstructor (
   IN EFI_SYSTEM_TABLE  *SystemTable
   )
 {
+  EFI_EVENT            Event;
+
+  //
+  // Register the event to publish the image execution table.
+  //
+  EfiCreateEventReadyToBootEx (
+    TPL_CALLBACK,
+    OnReadyToBoot, 
+    NULL, 
+    &Event
+    ); 
+
   return RegisterSecurity2Handler (
           DxeImageVerificationHandler,
           EFI_AUTH_OPERATION_VERIFY_IMAGE | EFI_AUTH_OPERATION_IMAGE_REQUIRED
-- 
cgit v1.2.3