tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/Core: fill logic hole in MemoryProtectionCpuArchProtocolNotify 

At the end of of MemoryProtectionCpuArchProtocolNotify there's cleanup
code to free resource. But at line 978, 994, 1005 the function returns
directly. This patch use "goto" to replace "return" to make sure the
resource is freed before exit.

1029:  CoreCloseEvent (Event);
1030:  return;

There's another memory leak after calling gBS->LocateHandleBuffer() in
the same function:

  Status = gBS->LocateHandleBuffer (
                  ByProtocol,
                  &gEfiLoadedImageProtocolGuid,
                  NULL,
                  &NoHandles,
                  &HandleBuffer
                  );

HandleBuffer is allocated in above call but never freed. This patch
will also add code to free it.

Cc: Star Zeng <star.zeng@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.wang@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Jian J Wang 2018-11-03 13:58:28 +08:00
parent d98fc9adfb
commit 8a7ff892ca
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MdeModulePkg/Core/Dxe/Misc/MemoryProtection.c
View File

@ -975,7 +975,7 @@ MemoryProtectionCpuArchProtocolNotify (
DEBUG ((DEBUG_INFO, "MemoryProtectionCpuArchProtocolNotify:\n")); DEBUG ((DEBUG_INFO, "MemoryProtectionCpuArchProtocolNotify:\n"));
Status = CoreLocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&gCpu); Status = CoreLocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **)&gCpu);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return; goto Done;
} }
// //
@ -991,7 +991,7 @@ MemoryProtectionCpuArchProtocolNotify (
HeapGuardCpuArchProtocolNotify (); HeapGuardCpuArchProtocolNotify ();
if (mImageProtectionPolicy == 0) { if (mImageProtectionPolicy == 0) {
return; goto Done;
} }
Status = gBS->LocateHandleBuffer ( Status = gBS->LocateHandleBuffer (
@ -1002,7 +1002,7 @@ MemoryProtectionCpuArchProtocolNotify (
&HandleBuffer &HandleBuffer
); );
if (EFI_ERROR (Status) && (NoHandles == 0)) { if (EFI_ERROR (Status) && (NoHandles == 0)) {
return ; goto Done;
} }
for (Index = 0; Index < NoHandles; Index++) { for (Index = 0; Index < NoHandles; Index++) {
@ -1025,9 +1025,10 @@ MemoryProtectionCpuArchProtocolNotify (
ProtectUefiImage (LoadedImage, LoadedImageDevicePath); ProtectUefiImage (LoadedImage, LoadedImageDevicePath);
} }
FreePool (HandleBuffer);
Done:
CoreCloseEvent (Event); CoreCloseEvent (Event);
return;
} }
/** /**