> -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Guomin Jiang > Sent: Thursday, March 26, 2020 2:43 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J; Wu, Hao A; Ni, Ray > Subject: [edk2-devel] [PATCH v3] MdeModulePkg/SdDxe: Check the Token to > avoid null pointer > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2286 > > Token pointer may be NULL, it should be checked before use it.
Reviewed-by: Hao A Wu <hao.a...@intel.com> Best Regards, Hao Wu > > Cc: Jian J Wang <jian.j.w...@intel.com> > Cc: Hao A Wu <hao.a...@intel.com> > Cc: Ray Ni <ray...@intel.com> > Signed-off-by: Guomin Jiang <guomin.ji...@intel.com> > --- > MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > index 9f42abe7e2..721f264377 100644 > --- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > @@ -1367,7 +1367,14 @@ SdEraseBlocks ( > return Status; > > } > > > > - DEBUG ((EFI_D_ERROR, "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x Event %p > with %r\n", Lba, BlockNum, Token->Event, Status)); > > + DEBUG (( > > + DEBUG_INFO, > > + "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x Event %p with %r\n", > > + Lba, > > + BlockNum, > > + (Token != NULL) ? Token->Event : NULL, > > + Status > > + )); > > > > return Status; > > } > > -- > 2.25.1.windows.1 > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > > View/Reply Online (#56363): https://edk2.groups.io/g/devel/message/56363 > Mute This Topic: https://groups.io/mt/72558979/1768737 > Group Owner: devel+ow...@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [hao.a...@intel.com] > -=-=-=-=-=-= -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#56364): https://edk2.groups.io/g/devel/message/56364 Mute This Topic: https://groups.io/mt/72558979/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
