sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update HobLib and Hob Service to avoid data over flow.

Browse Source 
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Rui Sun <rui.sun@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13533 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2012-07-17 01:51:26 +00:00
parent 192764dba9
commit e94728b359
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MdeModulePkg/Core/Pei/Hob/Hob.c
View File

@@ -1,7 +1,7 @@
/** @file /** @file
This module provide Hand-Off Block manupulation. This module provide Hand-Off Block manupulation.
Copyright (c) 2006, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@@ -89,6 +89,12 @@ PeiCreateHob (
HandOffHob = *Hob; HandOffHob = *Hob;
//
// Check Length to avoid data overflow.
//
if (0x10000 - Length <= 0x7) {
return EFI_INVALID_PARAMETER;
}
Length = (UINT16)((Length + 0x7) & (~0x7)); Length = (UINT16)((Length + 0x7) & (~0x7));
FreeMemory = HandOffHob->EfiFreeMemoryTop - FreeMemory = HandOffHob->EfiFreeMemoryTop -

6
MdeModulePkg/Core/Pei/Memory/MemoryServices.c
View File

@@ -1,7 +1,7 @@
/** @file /** @file
EFI PEI Core memory services EFI PEI Core memory services
Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@@ -249,9 +249,9 @@ PeiAllocatePool (
// //
// Generally, the size of heap in temporary memory does not exceed to 64K, // Generally, the size of heap in temporary memory does not exceed to 64K,
// so the maxmium size of pool is 0x10000 - sizeof (EFI_HOB_MEMORY_POOL) // HobLength is multiples of 8 bytes, so the maxmium size of pool is 0xFFF8 - sizeof (EFI_HOB_MEMORY_POOL)
// //
if (Size >= (0x10000 - sizeof (EFI_HOB_MEMORY_POOL))) { if (Size > (0xFFF8 - sizeof (EFI_HOB_MEMORY_POOL))) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }