From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=216.228.121.64; helo=hqemgate15.nvidia.com; envelope-from=jbrasen@nvidia.com; receiver=edk2-devel@lists.01.org Received: from hqemgate15.nvidia.com (hqemgate15.nvidia.com [216.228.121.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id AE0532115C325 for ; Fri, 9 Nov 2018 09:17:28 -0800 (PST) Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqemgate15.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Fri, 09 Nov 2018 09:17:24 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Fri, 09 Nov 2018 09:17:28 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Fri, 09 Nov 2018 09:17:28 -0800 Received: from HQMAIL106.nvidia.com (172.18.146.12) by HQMAIL108.nvidia.com (172.18.146.13) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 9 Nov 2018 17:17:27 +0000 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by HQMAIL106.nvidia.com (172.18.146.12) with Microsoft SMTP Server (TLS) id 15.0.1395.4 via Frontend Transport; Fri, 9 Nov 2018 17:17:27 +0000 Received: from jbrasen-ux.nvidia.com (Not Verified[10.28.48.113]) by hqnvemgw02.nvidia.com with Trustwave SEG (v7, 5, 8, 10121) id ; Fri, 09 Nov 2018 09:17:27 -0800 From: Jeff Brasen To: CC: Jeff Brasen Date: Fri, 9 Nov 2018 10:17:19 -0700 Message-ID: <2e217c22948e3acd3a12c99940d1a3964f648a7c.1541783820.git.jbrasen@nvidia.com> X-Mailer: git-send-email 2.7.4 X-NVConfidentiality: public MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1541783844; bh=/NGMWMScNpMg84x/hdKPfogUXgPS4Ck0dNphMP1oq3c=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: X-NVConfidentiality:MIME-Version:Content-Type; b=r19odzRdiEcrxAdFOHVAoXTyZYgkNCgEJwzOhMjdflHHg39LUQV6ru17Fq5yC3neN M0DWtUknDYgw2RSbdZV4r4XtWaEHrMXhr8N/EMoz5r6e6FAs12vaUKRyr0W4uSGXBa bMQVGYQjcphvGIobfBIXB54qg+8rOFyGX+yz4q2Vx4fz3hC+0FsTjM4MWEniMABGF9 ItRsozr1ji1U5m/SBLypqGAZb0PU82I8Uys2W9PpHCj9obj51nUwX3ILQGqACvdGvQ /BobS7kFwNlGNGTEzyBMlB2d8DM6Ic3c3gcuWmfQ735QhRXeMpRC8D3D8mrDRz0pU1 JLgkUksOtn8Tw== Subject: [PATCH] MdeModulePkg/SdDxe: Fix potential NULL pointer access X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Nov 2018 17:17:28 -0000 Content-Type: text/plain 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 --- MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c index b8d115a..920e3cd 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c @@ -670,8 +670,11 @@ 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)); - + if (Token != NULL) { + DEBUG ((DEBUG_BLKIO, "Sd%a(): Lba 0x%x BlkNo 0x%x Event %p with %r\n", IsRead ? "Read" : "Write", Lba, BlockNum, Token->Event, Status)); + } else { + DEBUG ((DEBUG_BLKIO, "Sd%a(): Lba 0x%x BlkNo 0x%x with %r\n", IsRead ? "Read" : "Write", Lba, BlockNum, Status)); + } Lba += BlockNum; Buffer = (UINT8*)Buffer + BufferSize; Remaining -= BlockNum; -- 2.7.4