Revision: 17599
http://sourceforge.net/p/edk2/code/17599
Author: lzeng14
Date: 2015-06-09 09:42:15 +0000 (Tue, 09 Jun 2015)
Log Message:
-----------
EdkCompatibilityPkg SmmBaseHelper: Unregister profile image correctly.
Call UnregisterSmramProfileImage() before image buffer freed.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <[email protected]>
Reviewed-by: Jiewen Yao <[email protected]>
Modified Paths:
--------------
trunk/edk2/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
trunk/edk2/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmramProfileRecord.c
Modified:
trunk/edk2/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
===================================================================
--- trunk/edk2/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
2015-06-09 09:41:50 UTC (rev 17598)
+++ trunk/edk2/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
2015-06-09 09:42:15 UTC (rev 17599)
@@ -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 @@
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);
}
}
Modified:
trunk/edk2/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmramProfileRecord.c
===================================================================
---
trunk/edk2/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmramProfileRecord.c
2015-06-09 09:41:50 UTC (rev 17598)
+++
trunk/edk2/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmramProfileRecord.c
2015-06-09 09:42:15 UTC (rev 17599)
@@ -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>
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
