diff options
| author | Star Zeng <star.zeng@intel.com> | 2018-01-15 10:26:07 +0800 |
|---|---|---|
| committer | Star Zeng <star.zeng@intel.com> | 2018-05-10 14:23:44 +0800 |
| commit | b6da5e382302c0109a2905e1d3ce0123e93c4081 (patch) | |
| tree | e235b0633113063f47503b458e4b589472b67d5d | |
| parent | af1b85332be9eaed20c1cdd000ecee9e3a632991 (diff) | |
| download | edk2-b6da5e382302c0109a2905e1d3ce0123e93c4081.tar.gz edk2-b6da5e382302c0109a2905e1d3ce0123e93c4081.tar.bz2 edk2-b6da5e382302c0109a2905e1d3ce0123e93c4081.zip | |
IntelSiliconPkg IntelVTdDxe: Fix potential NULL pointer dereference
The implementation of MdeModulePkg\Universal\Acpi\AcpiTableDxe reserves
first entry of RSDT/XSDT to FADT, the first entry value is 0 when FADT
is not installed. So the RSDT/XSDT parsing code should check the entry
value first before checking the table signature.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
(cherry picked from commit 01bd1c98fa83ef4449798fcf206fbd40db97b2d6)
| -rw-r--r-- | IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c index b981bcdb3a..342830a01f 100644 --- a/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c +++ b/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/DmarAcpiTable.c @@ -1,6 +1,6 @@ /** @file
- Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2017 - 2018, 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
@@ -889,7 +889,7 @@ ScanTableInRSDT ( EntryPtr = &Rsdt->Entry;
for (Index = 0; Index < EntryCount; Index ++, EntryPtr ++) {
Table = (EFI_ACPI_DESCRIPTION_HEADER*)((UINTN)(*EntryPtr));
- if (Table->Signature == Signature) {
+ if ((Table != NULL) && (Table->Signature == Signature)) {
return Table;
}
}
@@ -923,7 +923,7 @@ ScanTableInXSDT ( for (Index = 0; Index < EntryCount; Index ++) {
CopyMem (&EntryPtr, (VOID *)(BasePtr + Index * sizeof(UINT64)), sizeof(UINT64));
Table = (EFI_ACPI_DESCRIPTION_HEADER*)((UINTN)(EntryPtr));
- if (Table->Signature == Signature) {
+ if ((Table != NULL) && (Table->Signature == Signature)) {
return Table;
}
}
|