MdeModulePkg: Update coding style

Update to follow Tiano Coding style. Fix potential NULL memory copy

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17474 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c
index 742abde4a6a125c7ab044687a91e97ed97107d7b..16b18e0a54dea7545ea4c005c165d5ed57435743 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.c
@@ -33,7 +33,7 @@ ESRT_MANAGEMENT_PROTOCOL  mEsrtManagementProtocolTemplate = {
   Get ESRT entry from ESRT Cache by FwClass Guid \r
 \r
   @param[in]       FwClass                FwClass of Esrt entry to get  \r
-  @param[in out]  Entry                   Esrt entry returned \r
+  @param[in, out]  Entry                  Esrt entry returned \r
   \r
   @retval EFI_SUCCESS                   The variable saving this Esrt Entry exists.\r
   @retval EF_NOT_FOUND                  No correct variable found.\r
@@ -217,7 +217,7 @@ EsrtDxeRegisterEsrtEntry(
 /**\r
   This function syn up Cached ESRT with data from FMP instances\r
   Function should be called after Connect All in order to locate all FMP protocols\r
-  installed\r
+  installed.\r
 \r
   @retval EFI_SUCCESS                      Successfully sync cache repository from FMP instances\r
   @retval EFI_NOT_FOUND                   No FMP Instance are found\r
@@ -587,8 +587,13 @@ EsrtReadyToBootEventNotify (
   EsrtTable->FwResourceCount    = (UINT32)((NonFmpRepositorySize + FmpRepositorySize) / sizeof(EFI_SYSTEM_RESOURCE_ENTRY));  \r
   EsrtTable->FwResourceCountMax = PcdGet32(PcdMaxNonFmpEsrtCacheNum) + PcdGet32(PcdMaxFmpEsrtCacheNum);\r
 \r
-  CopyMem(EsrtTable + 1, NonFmpEsrtRepository, NonFmpRepositorySize);\r
-  CopyMem((UINT8 *)(EsrtTable + 1) + NonFmpRepositorySize, FmpEsrtRepository, FmpRepositorySize);\r
+  if (NonFmpRepositorySize != 0 && NonFmpEsrtRepository != NULL) {\r
+    CopyMem(EsrtTable + 1, NonFmpEsrtRepository, NonFmpRepositorySize);\r
+  }\r
+\r
+  if (FmpRepositorySize != 0 && FmpEsrtRepository != NULL) {\r
+    CopyMem((UINT8 *)(EsrtTable + 1) + NonFmpRepositorySize, FmpEsrtRepository, FmpRepositorySize);\r
+  }\r
 \r
   //\r
   // Publish Esrt to system config table\r
@@ -611,7 +616,17 @@ EXIT:
   }\r
 }\r
 \r
+/**\r
+  The module Entry Point of the Esrt DXE driver that manages cached ESRT repository \r
+  & publishes ESRT table\r
 \r
+  @param[in]  ImageHandle    The firmware allocated handle for the EFI image.\r
+  @param[in]  SystemTable    A pointer to the EFI System Table.\r
+\r
+  @retval EFI_SUCCESS    The entry point is executed successfully.\r
+  @retval Other          Some error occurs when executing this entry point.\r
+\r
+**/\r
 EFI_STATUS\r
 EFIAPI\r
 EsrtDxeEntryPoint (\r

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
index 573f8cd32b97b9ac19fb6e06bcc28c2c55a0683e..88440c8588081be7fa0feb0f8b46899b1ad5a501 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtDxe.inf
@@ -30,6 +30,7 @@
 #\r
 \r
 [Sources]\r
+  EsrtImpl.h\r
   EsrtImpl.c\r
   EsrtDxe.c\r
 \r
@@ -50,8 +51,8 @@
   PrintLib\r
 \r
 [Guids]\r
-  gEfiSystemResourceTableGuid             ## PRODUCES\r
-  gEfiEventReadyToBootGuid                ## CONSUMES\r
+  gEfiSystemResourceTableGuid             ## PRODUCES             ## SystemTable\r
+  gEfiEventReadyToBootGuid                ## CONSUMES             ## Event\r
 \r
 [Protocols]\r
   gEfiFirmwareManagementProtocolGuid      ## SOMETIMES_CONSUMES\r

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c
index 09255bd632a4b203cae92b9b70b16721a216ad26..f6d1e97451477348a5bb279549ccc2619b306eb2 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.c
@@ -174,7 +174,7 @@ InsertEsrtEntry(
       goto EXIT;\r
     }\r
 \r
-    if (RepositorySize != 0) {\r
+    if (RepositorySize != 0 && EsrtRepository != NULL) {\r
       CopyMem(EsrtRepositoryNew, EsrtRepository, RepositorySize);\r
     }\r
     CopyMem((UINT8 *)EsrtRepositoryNew + RepositorySize, Entry, sizeof(EFI_SYSTEM_RESOURCE_ENTRY));\r
@@ -393,9 +393,9 @@ EXIT:
 /**\r
   Init one ESRT entry according to input FmpImageInfo (V1, V2, V3) .\r
 \r
-  @param[in]    EsrtEntry                Esrt entry to be Init\r
-  @param[in]    FmpImageInfo        FMP image info descriptor\r
-  @param[in]   DescriptorVersion    FMP Image info descriptor version\r
+  @param[in, out]     EsrtEntry            Esrt entry to be Init\r
+  @param[in]          FmpImageInfo         FMP image info descriptor\r
+  @param[in]          DescriptorVersion    FMP Image info descriptor version\r
   \r
 **/\r
 VOID \r

diff --git a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
index b26cbd2590f6ab512fea4bdfa3cb2fdfbc0f129f..a238dfb8f78eab21f1bcdf2ebdd53b7deb46b818 100644 (file)
--- a/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
+++ b/MdeModulePkg/Universal/EsrtDxe/EsrtImpl.h
@@ -137,9 +137,9 @@ UpdateEsrtEntry(
 /**\r
   Init one ESRT entry according to input FmpImageInfo (V1, V2, V3) .\r
 \r
-  @param[in]    EsrtEntry                Esrt entry to be Init\r
-  @param[in]    FmpImageInfo        FMP image info descriptor\r
-  @param[in]   DescriptorVersion    FMP Image info descriptor version\r
+  @param[in, out]    EsrtEntry             Esrt entry to be Init\r
+  @param[in]         FmpImageInfo          FMP image info descriptor\r
+  @param[in]         DescriptorVersion     FMP Image info descriptor version\r
   \r
 **/\r
 VOID \r
@@ -153,7 +153,7 @@ SetEsrtEntryFromFmpInfo (
   Get ESRT entry from ESRT Cache by FwClass Guid \r
 \r
   @param[in]       FwClass                FwClass of Esrt entry to get  \r
-  @param[in out]  Entry                   Esrt entry returned \r
+  @param[in, out]  Entry                  Esrt entry returned \r
   \r
   @retval EFI_SUCCESS                   The variable saving this Esrt Entry exists.\r
   @retval EF_NOT_FOUND                  No correct variable found.\r
@@ -215,7 +215,7 @@ EsrtDxeRegisterEsrtEntry(
 /**\r
   This function syn up Cached ESRT with data from FMP instances\r
   Function should be called after Connect All in order to locate all FMP protocols\r
-  installed\r
+  installed.\r
 \r
   @retval EFI_SUCCESS                      Successfully sync cache repository from FMP instances\r
   @retval EFI_NOT_FOUND                   No FMP Instance are found\r