diff options
author | Star Zeng <star.zeng@intel.com> | 2018-10-19 15:56:57 +0800 |
---|---|---|
committer | Star Zeng <star.zeng@intel.com> | 2018-10-21 09:57:44 +0800 |
commit | e7ac09b957561ba4533cb0a8297a568723ca8bd7 (patch) | |
tree | 3f6e4ea8c863adfe26bb32fb22b413f1329dd094 | |
parent | a2e61f341d26a78751b2f19b5004c6bbfc8b4fa9 (diff) | |
download | edk2-e7ac09b957561ba4533cb0a8297a568723ca8bd7.tar.gz edk2-e7ac09b957561ba4533cb0a8297a568723ca8bd7.tar.bz2 edk2-e7ac09b957561ba4533cb0a8297a568723ca8bd7.zip |
MdePkg UefiLib: Check Table against NULL in ScanTableInSDT
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1266
af5e95215928e052445c473f1244412dadea8252 abstracted generic functions
from different modules (IntelVTdDxe, S3SaveStateDxe, PcRtc,
DpDynamicCommand and PiSmmCpuDxeSmm). Some of them (IntelVTdDxe and
PcRtc) checked Table against NULL before accessing Table->Signature,
some (S3SaveStateDxe, DpDynamicCommand and PiSmmCpuDxeSmm did not.
The ScanTableInSDT() in Acpi.c of UefiLib was mainly from
S3SaveStateDxe, so it does not check Table against NULL before
accessing Table->Signature.
This patch updates ScanTableInSDT() to check Table against NULL first
before accessing Table->Signature.
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jian J Wang <jian.j.wang@intel.com>
-rw-r--r-- | MdePkg/Library/UefiLib/Acpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MdePkg/Library/UefiLib/Acpi.c b/MdePkg/Library/UefiLib/Acpi.c index 4df6731ff0..59a828835c 100644 --- a/MdePkg/Library/UefiLib/Acpi.c +++ b/MdePkg/Library/UefiLib/Acpi.c @@ -67,7 +67,7 @@ ScanTableInSDT ( EntryPtr = 0;
CopyMem (&EntryPtr, (VOID *)(BasePtr + Index * TablePointerSize), TablePointerSize);
Table = (EFI_ACPI_COMMON_HEADER *)((UINTN)(EntryPtr));
- if (Table->Signature == Signature) {
+ if ((Table != NULL) && (Table->Signature == Signature)) {
if (PreviousTable != NULL) {
if (Table == PreviousTable) {
*PreviousTableLocated = TRUE;
|