Reviewed-by: [email protected] > -----Original Message----- > From: Chiu, Chasel > Sent: Monday, October 29, 2018 9:18 AM > To: [email protected] > Cc: Yao, Jiewen <[email protected]>; Desimone, Nathaniel L > <[email protected]>; Chiu, Chasel <[email protected]> > Subject: [PATCH v2] IntelFsp2Pkg: Fixed potentially NULL pointer accessing > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1280 > > When copying IDT table in SecMain, the pointer might be > NULL so added the check to fix it. > > Test: Verified on internal platform and boots successfully. > > Cc: Jiewen Yao <[email protected]> > Cc: Desimone Nathaniel L <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Chasel Chiu <[email protected]> > --- > IntelFsp2Pkg/FspSecCore/SecMain.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.c > b/IntelFsp2Pkg/FspSecCore/SecMain.c > index f319c68cc5..70460a3c8b 100644 > --- a/IntelFsp2Pkg/FspSecCore/SecMain.c > +++ b/IntelFsp2Pkg/FspSecCore/SecMain.c > @@ -100,7 +100,7 @@ SecStartup ( > // |-------------------|----> TempRamBase > IdtTableInStack.PeiService = NULL; > AsmReadIdtr (&IdtDescriptor); > - if ((IdtDescriptor.Base == 0) && (IdtDescriptor.Limit == 0xFFFF)) { > + if (IdtDescriptor.Base == 0) { > ExceptionHandler = FspGetExceptionHandler(mIdtEntryTemplate); > for (Index = 0; Index < FixedPcdGet8(PcdFspMaxInterruptSupported); > Index ++) { > CopyMem ((VOID*)&IdtTableInStack.IdtTable[Index], > (VOID*)&ExceptionHandler, sizeof (UINT64)); > @@ -113,8 +113,9 @@ SecStartup ( > // ERROR: IDT table size from boot loader is larger than FSP can > support, DeadLoop here! > // > CpuDeadLoop(); > + } else { > + CopyMem ((VOID *) (UINTN) &IdtTableInStack.IdtTable, (VOID *) > IdtDescriptor.Base, IdtSize); > } > - CopyMem ((VOID *) (UINTN) &IdtTableInStack.IdtTable, (VOID *) > IdtDescriptor.Base, IdtSize); > } > IdtDescriptor.Base = (UINTN) &IdtTableInStack.IdtTable; > IdtDescriptor.Limit = (UINT16)(IdtSize - 1); > -- > 2.13.3.windows.1
_______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
