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

UefiCpuPkg/PiSmmCpuDxeSmm: Fix ASSERT for success. 

Index is initialized to MAX_UINT16 as default failure value, which
is what the ASSERT is supposed to test for.  The ASSERT condition
however can never return FALSE for INT16 != int, as due to
Integer Promotion[1], Index is converted to int, which can never
result in -1.

Furthermore, Index is used as a for loop index variable inbetween its
initialization and the ASSERT, so the value is unconditionally
overwritten too.

Fix the ASSERT check to compare Index to its upper boundary, which it
will be equal to if the loop was not broken out of on success.

[1] ISO/IEC 9899:2011, 6.5.9.4

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
This commit is contained in:
Marvin H?user 2018-10-28 16:51:23 +08:00 committed by Eric Dong
parent 37fba7c276
commit 4222e8e7e4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UefiCpuPkg/PiSmmCpuDxeSmm/X64/SmmFuncsArch.c
View File

@ -110,7 +110,6 @@ GetProtectedModeCS (
UINTN GdtEntryCount; UINTN GdtEntryCount;
UINT16 Index; UINT16 Index;
Index = (UINT16) -1;
AsmReadGdtr (&GdtrDesc); AsmReadGdtr (&GdtrDesc);
GdtEntryCount = (GdtrDesc.Limit + 1) / sizeof (IA32_SEGMENT_DESCRIPTOR); GdtEntryCount = (GdtrDesc.Limit + 1) / sizeof (IA32_SEGMENT_DESCRIPTOR);
GdtEntry = (IA32_SEGMENT_DESCRIPTOR *) GdtrDesc.Base; GdtEntry = (IA32_SEGMENT_DESCRIPTOR *) GdtrDesc.Base;
@ -122,7 +121,7 @@ GetProtectedModeCS (
} }
GdtEntry++; GdtEntry++;
} }
ASSERT (Index != -1); ASSERT (Index != GdtEntryCount);
return Index * 8; return Index * 8;
} }