tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ShellPkg: acpiview: FADT: Validate global pointer before use 

Check if global pointers have been successfully updated before they
are used for further table parsing.

Signed-off-by: Krzysztof Koch <krzysztof.koch@arm.com>
This commit is contained in:
Krzysztof Koch 2020-01-20 19:13:43 +08:00 committed by mergify[bot]
parent f69248d093
commit 54d33a5314
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Fadt/FadtParser.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
FADT table parser FADT table parser
Copyright (c) 2016 - 2019, ARM Limited. All rights reserved. Copyright (c) 2016 - 2020, ARM Limited. All rights reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent SPDX-License-Identifier: BSD-2-Clause-Patent
@par Reference(s): @par Reference(s):
@ -230,9 +230,11 @@ ParseAcpiFadt (
); );
if (Trace) { if (Trace) {
Print (L"\nSummary:\n"); if (FadtMinorRevision != NULL) {
PrintFieldName (2, L"FADT Version"); Print (L"\nSummary:\n");
Print (L"%d.%d\n", *AcpiHdrInfo.Revision, *FadtMinorRevision); PrintFieldName (2, L"FADT Version");
Print (L"%d.%d\n", *AcpiHdrInfo.Revision, *FadtMinorRevision);
}
if (*GetAcpiXsdtHeaderInfo ()->OemTableId != *AcpiHdrInfo.OemTableId) { if (*GetAcpiXsdtHeaderInfo ()->OemTableId != *AcpiHdrInfo.OemTableId) {
IncrementErrorCount (); IncrementErrorCount ();
@ -294,21 +296,20 @@ ParseAcpiFadt (
); );
} }
// If X_DSDT is not zero then use X_DSDT and ignore DSDT, // If X_DSDT is valid then use X_DSDT and ignore DSDT, else use DSDT.
// else use DSDT. if ((X_DsdtAddress != NULL) && (*X_DsdtAddress != 0)) {
if (*X_DsdtAddress != 0) {
DsdtPtr = (UINT8*)(UINTN)(*X_DsdtAddress); DsdtPtr = (UINT8*)(UINTN)(*X_DsdtAddress);
} else if (*DsdtAddress != 0) { } else if ((DsdtAddress != NULL) && (*DsdtAddress != 0)) {
DsdtPtr = (UINT8*)(UINTN)(*DsdtAddress); DsdtPtr = (UINT8*)(UINTN)(*DsdtAddress);
} else { } else {
// Both DSDT and X_DSDT cannot be zero. // Both DSDT and X_DSDT cannot be invalid.
#if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64) #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)
if (Trace) { if (Trace) {
// The DSDT Table is mandatory for ARM systems // The DSDT Table is mandatory for ARM systems
// as the CPU information MUST be presented in // as the CPU information MUST be presented in
// the DSDT. // the DSDT.
IncrementErrorCount (); IncrementErrorCount ();
Print (L"ERROR: Both X_DSDT and DSDT are NULL.\n"); Print (L"ERROR: Both X_DSDT and DSDT are invalid.\n");
} }
#endif #endif
return; return;