From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web12.31961.1585204973316712239 for ; Wed, 25 Mar 2020 23:42:53 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: guomin.jiang@intel.com) IronPort-SDR: TCAK8hscA3wsfCTOWdVhlvlsT5QXmVrwzV6/hZPKR4CoxNoZ2hhcCMPn+CMPMSG6I79zjaD0BJ 24gY3OhFpmAA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2020 23:42:52 -0700 IronPort-SDR: Ll6r1VAOBBgqcOH9SYMRCSARa3dNu6AfWaIcskqKJPAKoH6QEdu3utZFHPQmnBdUYe1x1qyNYT zcBtwDshdIZQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,307,1580803200"; d="scan'208";a="420585729" Received: from guominji-mobl.ccr.corp.intel.com ([10.238.5.173]) by orsmga005.jf.intel.com with ESMTP; 25 Mar 2020 23:42:51 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Ray Ni Subject: [PATCH v3] MdeModulePkg/SdDxe: Check the Token to avoid null pointer Date: Thu, 26 Mar 2020 14:42:50 +0800 Message-Id: <20200326064250.1519-1-guomin.jiang@intel.com> X-Mailer: git-send-email 2.25.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2286 Token pointer may be NULL, it should be checked before use it. Cc: Jian J Wang Cc: Hao A Wu Cc: Ray Ni Signed-off-by: Guomin Jiang --- 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/Sd= Dxe/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;=0D }=0D =0D - DEBUG ((EFI_D_ERROR, "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x Event %p with= %r\n", Lba, BlockNum, Token->Event, Status));=0D + DEBUG ((=0D + DEBUG_INFO,=0D + "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x Event %p with %r\n",=0D + Lba,=0D + BlockNum,=0D + (Token !=3D NULL) ? Token->Event : NULL,=0D + Status=0D + ));=0D =0D return Status;=0D }=0D --=20 2.25.1.windows.1