From c4b90c071d55dc75d2f6d47de1e11f3018fc2907 Mon Sep 17 00:00:00 2001 From: Star Zeng Date: Wed, 18 Mar 2015 08:49:21 +0000 Subject: [PATCH] EdkCompatibilityPkg: Use ImageContext.ImageSize to allocate memory for PE image to handle the case PE file alignment is not same as PE section alignment. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng Reviewed-by: Jiewen Yao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17064 6f19259b-4bc3-4df7-8a09-765794883524 --- .../BootScriptSaveOnS3SaveStateThunk/ScriptSave.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/EdkCompatibilityPkg/Compatibility/BootScriptSaveOnS3SaveStateThunk/ScriptSave.c b/EdkCompatibilityPkg/Compatibility/BootScriptSaveOnS3SaveStateThunk/ScriptSave.c index 4d1013caf0..03e7ea60c3 100644 --- a/EdkCompatibilityPkg/Compatibility/BootScriptSaveOnS3SaveStateThunk/ScriptSave.c +++ b/EdkCompatibilityPkg/Compatibility/BootScriptSaveOnS3SaveStateThunk/ScriptSave.c @@ -2,7 +2,7 @@ Implementation for S3 Boot Script Save thunk driver. This thunk driver consumes PI S3SaveState protocol to produce framework S3BootScriptSave Protocol - Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.
+ Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.
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 @@ -899,7 +899,11 @@ InitializeScriptSaveOnS3SaveState ( ASSERT_EFI_ERROR (Status); MemoryAddress = SIZE_4GB - 1; - PageNumber = EFI_SIZE_TO_PAGES (BufferSize + ImageContext.SectionAlignment); + if (ImageContext.SectionAlignment > EFI_PAGE_SIZE) { + PageNumber = EFI_SIZE_TO_PAGES (ImageContext.ImageSize + ImageContext.SectionAlignment); + } else { + PageNumber = EFI_SIZE_TO_PAGES (ImageContext.ImageSize); + } Status = gBS->AllocatePages ( AllocateMaxAddress, EfiReservedMemoryType, -- 2.39.2