From nobody Sat May 18 19:48:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+97923+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97923+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1672822475; cv=none; d=zohomail.com; s=zohoarc; b=RW/vr9DFUBqKn63p2/SRwlxqNNk0DEZbatIZy7xjaL9AjflLcSh3V8otuxoNjcesAvYimBDhdcGXNsu+8k2ceV8Jdt1UNGtgfWmxIv0mPdOq6pEa50lAEUmP8xC2xmPOlfjiNxlfey6TbzZoR77UaM+BEE6uEeUWqpWwVHnJbMQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1672822475; h=Content-Type:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=LUbTcH3EJ+g8HbQHqQg84TRMSTF99bZXtT8N17lfCfg=; b=h2j/d3SOcKRR28+HqZgMxVcZlm0IHtx2dSXgLXuQQ/ABNDRthkQghpJlKxIIqIGV4oDcUPBmDjV2+uJvGN0AYYFpKHmhbUy9WHrq0xKTLMUNlFlZFTF8uykF64UEnQfkjqN/23TrpzEli5+fyh+4tlcsUXY3ApuCC7h8Bnm9tpU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+97923+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1672822475755381.17792451035893; Wed, 4 Jan 2023 00:54:35 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id eaA4YY1788612xUvbTzDaHbZ; Wed, 04 Jan 2023 00:54:35 -0800 Subject: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/XhciDxe: Fix FORWARD_NULL Coverity issues To: devel@edk2.groups.io From: "Ranbir Singh via groups.io" X-Originating-Location: Bengaluru, Karnataka, IN (122.172.85.38) X-Originating-Platform: Windows Chrome 108 User-Agent: GROUPS.IO Web Poster MIME-Version: 1.0 Date: Wed, 04 Jan 2023 00:54:34 -0800 Message-ID: Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,Ranbir.Singh3@Dell.com X-Gm-Message-State: ATbwqLKfp54r1bBh1hzpIZH9x1787277AA= Content-Type: multipart/alternative; boundary="dJwipm7XRrK9QZAt7AsA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1672822475; bh=sIcrERbvelMDc1ud4QxzwdPDsQKLV5WuGnEtTUBCwDk=; h=Content-Type:Date:From:Reply-To:Subject:To; b=fqxDwuVhKKRml19B1Yd9D93gWCGaU5QOCdESgcCPrP2dICaBunXWuds7zbJ0A/bHCmV YDnS7iOx4SAGfMt5lVx0+O3hy0DMVqa3PRArSFkfxfsHgdQ5XV6GiikD2JtDTFElJ9Krp BLi95cwRu4NWqDK/ZiknhHs/e1paIICMweA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1672822477915100003 --dJwipm7XRrK9QZAt7AsA Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 The functions UsbHcGetHostAddrForPciAddr, UsbHcGetPciAddrForHostAddr and UsbHcFreeMem do have ASSERT ((Block !=3D NULL)); statements after for loop, but these are applicable only in DEBUG mode. In RELEASE mode, if for whatever reasons there is no match inside for loop and the loop exits because of Block !=3D NULL; condition, then there is no "Block" NULL pointer check afterwards and the code proceeds to do dereferencing "Block" which will lead to CRASH. Hence, for safety add NULL pointer checks always. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4221 Signed-off-by: Ranbir Singh --- MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c b/MdeModulePkg/Bus/Pci= /XhciDxe/UsbHcMem.c index d0ad1582e4..869ae6ec8a 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c @@ -261,6 +261,10 @@ UsbHcGetPciAddrForHostAddr ( } ASSERT ((Block !=3D NULL)); +=C2=A0 if (Block =3D=3D NULL) { +=C2=A0 =C2=A0 return 0; +=C2=A0 } + // // calculate the pci memory address for host memory address. // @@ -310,6 +314,10 @@ UsbHcGetHostAddrForPciAddr ( } ASSERT ((Block !=3D NULL)); +=C2=A0 if (Block =3D=3D NULL) { +=C2=A0 =C2=A0 return 0; +=C2=A0 } + // // calculate the pci memory address for host memory address. // @@ -590,6 +598,9 @@ UsbHcFreeMem ( // the caller has passed in a wrong memory point // ASSERT (Block !=3D NULL); +=C2=A0 if (Block =3D=3D NULL) { +=C2=A0 =C2=A0 return; +=C2=A0 } // // Release the current memory block if it is empty and not the head -- 2.36.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#97923): https://edk2.groups.io/g/devel/message/97923 Mute This Topic: https://groups.io/mt/96046873/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- --dJwipm7XRrK9QZAt7AsA Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable
The functions UsbHcGetHostAddrForPciAddr, UsbHcGetPciAddrForHostAddr
and UsbHcFreeMem do have
 
    ASSERT ((Block !=3D NULL));
 
statements after for loop, but these are applicable only in DEBUG mode= .
In RELEASE mode, if for whatever reasons there is no match inside for<= /div>
loop and the loop exits because of Block !=3D NULL; condition, then th= ere
is no "Block" NULL pointer check afterwards and the code proceeds to d= o
dereferencing "Block" which will lead to CRASH.
 
Hence, for safety add NULL pointer checks always.
 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4221
Signed-off-by: Ranbir Singh <Ranbir.Singh3@Dell.com>
---
 MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c | 11 +++++++++++
 1 file changed, 11 insertions(+)
 
diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c b/MdeModulePkg/Bu= s/Pci/XhciDxe/UsbHcMem.c
index d0ad1582e4..869ae6ec8a 100644
--- a/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c
+++ b/MdeModulePkg/Bus/Pci/XhciDxe/UsbHcMem.c
@@ -261,6 +261,10 @@ UsbHcGetPciAddrForHostAddr (
   }
 
   ASSERT ((Block !=3D NULL));
+  if (Block =3D=3D NULL) {
+    return 0;
+  }
+
   //
   // calculate the pci memory address for host memory addre= ss.
   //
@@ -310,6 +314,10 @@ UsbHcGetHostAddrForPciAddr (
   }
 
   ASSERT ((Block !=3D NULL));
+  if (Block =3D=3D NULL) {
+    return 0;
+  }
+
   //
   // calculate the pci memory address for host memory addre= ss.
   //
@@ -590,6 +598,9 @@ UsbHcFreeMem (
   // the caller has passed in a wrong memory point
   //
   ASSERT (Block !=3D NULL);
+  if (Block =3D=3D NULL) {
+    return;
+  }
 
   //
   // Release the current memory block if it is empty and no= t the head
--
2.36.1.windows.1
_._,_._,_
Groups.io Links:

=20 You receive all messages sent to this group. =20 =20

= View/Reply Online (#97923) | =20 | Mute = This Topic | New Topic
Your Subscriptio= n | Contact Group Owner | Unsubscribe [importer@patchew.org]

_._,_._,_
--dJwipm7XRrK9QZAt7AsA--