MdeModulePkg: fix cast in GetModuleInfoFromHandle() calls

GetModuleInfoFromHandle() takes an EFI_HANDLE -- (VOID*) -- as first
parameter, but InsertFpdtRecord() passes (EFI_HANDLE*) -- (VOID**).
(VOID**) converts silently to (VOID*), which is why the wrong cast is
masked.

Note that the *value* that is passed is alright -- therefore this patch
does not change behavior --, it's just semantically wrong to pass an
(EFI_HANDLE*) where an EFI_HANDLE is expected.

Cc: Dandan Bi <dandan.bi@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>

diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
index 0d507c445210f27a4130cc74c475a18b0f7213db..f500e20b320bc7fbc0606586a71c204d992bc185 100644 (file)
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
@@ -998,7 +998,7 @@ InsertFpdtRecord (
   switch (PerfId) {\r
   case MODULE_START_ID:\r
   case MODULE_END_ID:\r
-    GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
+    GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
     StringPtr = ModuleName;\r
     //\r
     // Cache the offset of start image start record and use to update the start image end record if needed.\r
@@ -1031,7 +1031,7 @@ InsertFpdtRecord (
 \r
   case MODULE_LOADIMAGE_START_ID:\r
   case MODULE_LOADIMAGE_END_ID:\r
-    GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
+    GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
     StringPtr = ModuleName;\r
     if (PerfId == MODULE_LOADIMAGE_START_ID) {\r
       mLoadImageCount ++;\r
@@ -1071,7 +1071,7 @@ InsertFpdtRecord (
   case MODULE_DB_SUPPORT_END_ID:\r
   case MODULE_DB_STOP_START_ID:\r
   case MODULE_DB_STOP_END_ID:\r
-    GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
+    GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
     StringPtr = ModuleName;\r
     if (!PcdGetBool (PcdEdkiiFpdtStringRecordEnableOnly)) {\r
       FpdtRecordPtr.GuidQwordEvent->Header.Type           = FPDT_GUID_QWORD_EVENT_TYPE;\r
@@ -1085,7 +1085,7 @@ InsertFpdtRecord (
     break;\r
 \r
   case MODULE_DB_END_ID:\r
-    GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
+    GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
     StringPtr = ModuleName;\r
     if (!PcdGetBool (PcdEdkiiFpdtStringRecordEnableOnly)) {\r
       FpdtRecordPtr.GuidQwordStringEvent->Header.Type     = FPDT_GUID_QWORD_STRING_EVENT_TYPE;\r
@@ -1131,7 +1131,7 @@ InsertFpdtRecord (
   case PERF_INMODULE_END_ID:\r
   case PERF_CROSSMODULE_START_ID:\r
   case PERF_CROSSMODULE_END_ID:\r
-    GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
+    GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
     if (String != NULL) {\r
       StringPtr = String;\r
     } else {\r
@@ -1153,7 +1153,7 @@ InsertFpdtRecord (
 \r
   default:\r
     if (Attribute != PerfEntry) {\r
-      GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
+      GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
       if (String != NULL) {\r
         StringPtr = String;\r
       } else {\r

diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
index 5f07464c4ec7d75229adac757a3fcbe2dc045c15..b4f22c14ae73aed4f7f9fecbde452ca5214a44d7 100644 (file)
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
+++ b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
@@ -587,7 +587,7 @@ InsertFpdtRecord (
   switch (PerfId) {\r
   case MODULE_START_ID:\r
   case MODULE_END_ID:\r
-    GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
+    GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
     StringPtr = ModuleName;\r
     //\r
     // Cache the offset of start image start record and use to update the start image end record if needed.\r
@@ -612,7 +612,7 @@ InsertFpdtRecord (
 \r
   case MODULE_LOADIMAGE_START_ID:\r
   case MODULE_LOADIMAGE_END_ID:\r
-    GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
+    GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
     StringPtr = ModuleName;\r
     if (PerfId == MODULE_LOADIMAGE_START_ID) {\r
       mLoadImageCount++;\r
@@ -669,7 +669,7 @@ InsertFpdtRecord (
   case PERF_INMODULE_END_ID:\r
   case PERF_CROSSMODULE_START_ID:\r
   case PERF_CROSSMODULE_END_ID:\r
-    GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
+    GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
     if (String != NULL) {\r
       StringPtr = String;\r
     } else {\r
@@ -691,7 +691,7 @@ InsertFpdtRecord (
 \r
   default:\r
     if (Attribute != PerfEntry) {\r
-      GetModuleInfoFromHandle ((EFI_HANDLE *)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
+      GetModuleInfoFromHandle ((EFI_HANDLE)CallerIdentifier, ModuleName, sizeof (ModuleName), &ModuleGuid);\r
       if (String != NULL) {\r
         StringPtr = String;\r
       } else {\r