Reviewed-by: [email protected]
> -----Original Message----- > From: edk2-devel [mailto:[email protected]] On Behalf Of Hao > Wu > Sent: Tuesday, August 1, 2017 12:32 PM > To: [email protected] > Cc: Wu, Hao A <[email protected]>; Yao, Jiewen <[email protected]> > Subject: [edk2] [PATCH 2/2] IntelSiliconPkg/IntelVTdDxe: Add explicit NULL > pointer checks > > Add explicit NULL pointer check to make the codes more straight-forward. > > Cc: Jiewen Yao <[email protected]> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Hao Wu <[email protected]> > --- > IntelSiliconPkg/IntelVTdDxe/TranslationTable.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/IntelSiliconPkg/IntelVTdDxe/TranslationTable.c > b/IntelSiliconPkg/IntelVTdDxe/TranslationTable.c > index 0cff2cc939..5af4a4627b 100644 > --- a/IntelSiliconPkg/IntelVTdDxe/TranslationTable.c > +++ b/IntelSiliconPkg/IntelVTdDxe/TranslationTable.c > @@ -862,6 +862,8 @@ SetAccessAttribute ( > VTD_SECOND_LEVEL_PAGING_ENTRY *SecondLevelPagingEntry; > UINT64 Pt; > > + SecondLevelPagingEntry = NULL; > + > DEBUG ((DEBUG_INFO,"SetAccessAttribute (S%04x B%02x D%02x F%02x) > (0x%016lx - 0x%08x, %x)\n", Segment, SourceId.Bits.Bus, SourceId.Bits.Device, > SourceId.Bits.Function, BaseAddress, (UINTN)Length, IoMmuAccess)); > > VtdIndex = FindVtdIndexByPciDevice (Segment, SourceId, &ExtContextEntry, > &ContextEntry); > @@ -884,7 +886,7 @@ SetAccessAttribute ( > SecondLevelPagingEntry = (VOID *)(UINTN)LShiftU64 > (ExtContextEntry->Bits.SecondLevelPageTranslationPointer, 12); > DEBUG ((DEBUG_VERBOSE,"SecondLevelPagingEntry - 0x%x (S%04x > B%02x D%02x F%02x)\n", SecondLevelPagingEntry, Segment, SourceId.Bits.Bus, > SourceId.Bits.Device, SourceId.Bits.Function)); > } > - } else { > + } else if (ContextEntry != NULL) { > if (ContextEntry->Bits.Present == 0) { > SecondLevelPagingEntry = CreateSecondLevelPagingEntry (VtdIndex, 0); > DEBUG ((DEBUG_VERBOSE,"SecondLevelPagingEntry - 0x%x (S%04x > B%02x D%02x F%02x) New\n", SecondLevelPagingEntry, Segment, > SourceId.Bits.Bus, SourceId.Bits.Device, SourceId.Bits.Function)); > @@ -959,7 +961,7 @@ AlwaysEnablePageAttribute ( > ExtContextEntry->Bits.SecondLevelPageTranslationPointer = Pt; > ExtContextEntry->Bits.DomainIdentifier = ((1 << > (UINT8)((UINTN)mVtdUnitInformation[VtdIndex].CapReg.Bits.ND * 2 + 4)) - 1); > ExtContextEntry->Bits.Present = 1; > - } else { > + } else if (ContextEntry != NULL) { > ContextEntry->Bits.SecondLevelPageTranslationPointer = Pt; > ContextEntry->Bits.DomainIdentifier = ((1 << > (UINT8)((UINTN)mVtdUnitInformation[VtdIndex].CapReg.Bits.ND * 2 + 4)) - 1); > ContextEntry->Bits.Present = 1; > -- > 2.12.0.windows.1 > > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
