From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.31529.1585202257947277765 for ; Wed, 25 Mar 2020 22:57:38 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: guomin.jiang@intel.com) IronPort-SDR: kCh/0brgSwNq3HCvuMs8dzs4YkHdzYiMpZKmvh5HcJxyNCS7OVGbfGGnAbHhRQE5xDDwEz/bB2 jlUAy9ih044g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2020 22:57:37 -0700 IronPort-SDR: ziHr146JcFWJgkITIPfQO6VgBI1YpuUtBa36mw5W9vQpGTYTQvlGjqzk2JYMVTqj61BpIbyBiI Ywf1FhEMuqmw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,307,1580803200"; d="scan'208";a="326459358" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga001.jf.intel.com with ESMTP; 25 Mar 2020 22:57:36 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 25 Mar 2020 22:56:55 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 25 Mar 2020 22:56:55 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 25 Mar 2020 22:56:54 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.43]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.201]) with mapi id 14.03.0439.000; Thu, 26 Mar 2020 13:56:53 +0800 From: "Guomin Jiang" To: "devel@edk2.groups.io" , "newexplorerj@gmail.com" CC: "Wu, Hao A" , "Ni, Ray" Subject: Re: [edk2-devel] [PATCH v2] MdeModulePkg/SdDxe: Potential NULL pointer on Token Thread-Topic: [edk2-devel] [PATCH v2] MdeModulePkg/SdDxe: Potential NULL pointer on Token Thread-Index: AQHV8gl9zVoMe/6B8EKunGAaxvv/r6hagjkg Date: Thu, 26 Mar 2020 05:56:52 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: guomin.jiang@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Ray, Hao Could you please help review this changes. Thanks. > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > GuoMinJ > Sent: Wednesday, March 4, 2020 5:41 PM > To: devel@edk2.groups.io > Cc: GuoMinJ ; Wu, Hao A > ; Ni, Ray > Subject: [edk2-devel] [PATCH v2] MdeModulePkg/SdDxe: Potential NULL > pointer on Token >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2286 >=20 > Token pointer may be NULL, it is should be check before use it. >=20 > Cc: Hao A Wu > Cc: Ray Ni > Signed-off-by: GuoMinJ > --- > MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) >=20 > diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > index 9f42abe7e2..0cc2e70b58 100644 > --- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c > @@ -1367,7 +1367,12 @@ SdEraseBlocks ( > return Status; > } >=20 > - DEBUG ((EFI_D_ERROR, "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x Event %p > with %r\n", Lba, BlockNum, Token->Event, Status)); > + DEBUG ((DEBUG_ERROR, "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x with %r, > + ", Lba, BlockNum, Status)); if ((Token !=3D NULL) && (Token->Event != =3D > NULL)) { > + DEBUG ((DEBUG_ERROR, "Event pointer is %p\n", Token->Event)); } > + else { > + DEBUG ((DEBUG_ERROR, "Event is meaningless\n")); } >=20 > return Status; > } > -- > 2.17.1 >=20 >=20 >=20