> -----Original Message----- > From: edk2-devel [mailto:[email protected]] On Behalf Of Jeff > Brasen > Sent: Friday, November 16, 2018 4:10 PM > To: [email protected] > Cc: Jeff Brasen > Subject: [edk2] [PATCH v2] MdeModulePkg/SdDxe: Fix potential NULL pointer > access > > SdReadWrite can be called with a NULL Token for synchronous operations. > Add guard for DEBUG print to only print event pointer with Token is not > NULL. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Jeff Brasen <[email protected]>
Thanks. Reviewed-by: Hao Wu <[email protected]> and pushed at 5a16ba3ae18e6528cb83039951e15a4b76004949 Best Regards, Hao Wu > --- > MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > index b8d115a..a4695ff 100644 > --- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > @@ -670,8 +670,9 @@ SdReadWrite ( > if (EFI_ERROR (Status)) { > return Status; > } > - DEBUG ((DEBUG_BLKIO, "Sd%a(): Lba 0x%x BlkNo 0x%x Event %p with %r\n", > IsRead ? "Read" : "Write", Lba, BlockNum, Token->Event, Status)); > - > + DEBUG ((DEBUG_BLKIO, "Sd%a(): Lba 0x%x BlkNo 0x%x Event %p > with %r\n", > + IsRead ? "Read" : "Write", Lba, BlockNum, > + (Token != NULL) ? Token->Event : NULL, Status)); > Lba += BlockNum; > Buffer = (UINT8*)Buffer + BufferSize; > Remaining -= BlockNum; > -- > 2.7.4 > > _______________________________________________ > 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
