summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStar Zeng <star.zeng@intel.com>2016-03-18 09:46:24 +0800
committerStar Zeng <star.zeng@intel.com>2016-03-22 11:00:39 +0800
commitf0459afe9172587bfdcef55ebe4beddb6fc8d286 (patch)
treed1466e07dc14d4178cc96f95f05418084d649fdc
parent6fe9d9c15b184ff0790b7ba0338c27fec58f7ebf (diff)
downloadedk2-f0459afe9172587bfdcef55ebe4beddb6fc8d286.tar.gz
edk2-f0459afe9172587bfdcef55ebe4beddb6fc8d286.tar.bz2
edk2-f0459afe9172587bfdcef55ebe4beddb6fc8d286.zip
MdeModulePkg DxeCore: Check Start consistently in CoreConvertPagesEx
Current check: ASSERT (NumberOfPages); ASSERT ((Start & EFI_PAGE_MASK) == 0); ASSERT (End > Start) ; if (NumberOfPages == 0 || ((Start & EFI_PAGE_MASK) != 0) || (Start > (Start + NumberOfBytes))) { This patch is to update "(Start > (Start + NumberOfBytes))" to "(Start >= End)" to be consistent with "ASSERT (End > Start)" Cc: Jiewen Yao <jiewen.yao@intel.com> Cc: Michael Kinney <michael.d.kinney@intel.com> Cc: Liming Gao <liming.gao@intel.com> Cc: Feng Tian <feng.tian@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Star Zeng <star.zeng@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
-rw-r--r--MdeModulePkg/Core/Dxe/Mem/Page.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c
index 9dbb85da7c..62738a1875 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -1,7 +1,7 @@
/** @file
UEFI Memory page management functions.
-Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2016, 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
@@ -725,7 +725,7 @@ CoreConvertPagesEx (
ASSERT_LOCKED (&gMemoryLock);
ASSERT ( (ChangingType == FALSE) || (ChangingAttributes == FALSE) );
- if (NumberOfPages == 0 || ((Start & EFI_PAGE_MASK) != 0) || (Start > (Start + NumberOfBytes))) {
+ if (NumberOfPages == 0 || ((Start & EFI_PAGE_MASK) != 0) || (Start >= End)) {
return EFI_INVALID_PARAMETER;
}