diff options
| author | Star Zeng <star.zeng@intel.com> | 2015-06-09 09:42:15 +0000 |
|---|---|---|
| committer | lzeng14 <lzeng14@Edk2> | 2015-06-09 09:42:15 +0000 |
| commit | 071586ee476b0c1325a008c6535dd4d2064252ab (patch) | |
| tree | 9def446840eba9980b19a2a9b766ac099bc60390 | |
| parent | 63aa86b0706929df73dca614f87e5b99bb58c48b (diff) | |
| download | edk2-platforms-071586ee476b0c1325a008c6535dd4d2064252ab.tar.xz | |
EdkCompatibilityPkg SmmBaseHelper: Unregister profile image correctly.
Call UnregisterSmramProfileImage() before image buffer freed.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17599 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c | 5 | ||||
| -rw-r--r-- | EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmramProfileRecord.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c index 2b94e4d877..1d1644923d 100644 --- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c +++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c @@ -11,7 +11,7 @@ SmmHandlerEntry() will receive untrusted input and do validation.
- Copyright (c) 2009 - 2013, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2009 - 2015, 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
@@ -34,7 +34,6 @@ #include <Library/MemoryAllocationLib.h>
#include <Library/SynchronizationLib.h>
#include <Library/CpuLib.h>
-#include <Library/PcdLib.h>
#include <Guid/SmmBaseThunkCommunication.h>
#include <Protocol/SmmBaseHelperReady.h>
#include <Protocol/SmmCpu.h>
@@ -734,10 +733,10 @@ LoadImage ( RegisterSmramProfileImage (FilePath, DstBuffer, PageCount);
Status = gBS->StartImage (*ImageHandle, NULL, NULL);
if (EFI_ERROR (Status)) {
+ UnregisterSmramProfileImage (FilePath, DstBuffer, PageCount);
mLoadPe32Image->UnLoadPeImage (mLoadPe32Image, *ImageHandle);
*ImageHandle = NULL;
FreePages ((VOID *)(UINTN)DstBuffer, PageCount);
- UnregisterSmramProfileImage (FilePath, DstBuffer, PageCount);
}
}
diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmramProfileRecord.c b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmramProfileRecord.c index 84eba482f4..a1797eaa60 100644 --- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmramProfileRecord.c +++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmramProfileRecord.c @@ -1,6 +1,6 @@ /** @file
- Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2014 - 2015, 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
@@ -20,6 +20,7 @@ #include <Library/DevicePathLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
+#include <Library/PcdLib.h>
#include <Protocol/SmmCommunication.h>
#include <Guid/MemoryProfile.h>
|