From mboxrd@z Thu Jan  1 00:00:00 1970
Subject: [PATCH] MdeModulePkg/Bus/Pci/EhciDxe: Fix FORWARD_NULL Coverity issues
To: devel@edk2.groups.io
From: "Ranbir Singh" <Ranbir.Singh3@Dell.com>
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: Tue, 03 Jan 2023 22:42:14 -0800
Message-ID: <yLAM.1672814534549024516.UWtb@groups.io>
Content-Type: multipart/alternative; boundary="bFL0dCYWJCDI4DBu75g1"

--bFL0dCYWJCDI4DBu75g1
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

The functions UsbHcGetPciAddressForHostMem 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=3D4210
Signed-off-by: Ranbir Singh <Ranbir.Singh3@Dell.com>
---
MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c b/MdeModulePkg/Bus/Pci=
/EhciDxe/UsbHcMem.c
index 0a3ceb9f71..79575b6f63 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c
@@ -250,6 +250,11 @@ UsbHcGetPciAddressForHostMem (
}

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.
//
@@ -536,6 +541,10 @@ UsbHcFreeMem (
//
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

--bFL0dCYWJCDI4DBu75g1
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

<div>The functions UsbHcGetPciAddressForHostMem and UsbHcFreeMem do have</d=
iv>
<div>&nbsp;</div>
<div>&nbsp; &nbsp; ASSERT ((Block !=3D NULL));</div>
<div>&nbsp;</div>
<div>statements after for loop, but these are applicable only in DEBUG mode=
.</div>
<div>In RELEASE mode, if for whatever reasons there is no match inside for<=
/div>
<div>loop and the loop exits because of Block !=3D NULL; condition, then th=
ere</div>
<div>is no "Block" NULL pointer check afterwards and the code proceeds to d=
o</div>
<div>dereferencing "Block" which will lead to CRASH.</div>
<div>&nbsp;</div>
<div>Hence, for safety add NULL pointer checks always.</div>
<div>&nbsp;</div>
<div>REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4210</div>
<div>Signed-off-by: Ranbir Singh &lt;Ranbir.Singh3@Dell.com&gt;</div>
<div>---</div>
<div>&nbsp;MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c | 9 +++++++++</div>
<div>&nbsp;1 file changed, 9 insertions(+)</div>
<div>&nbsp;</div>
<div>diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c b/MdeModulePkg/Bu=
s/Pci/EhciDxe/UsbHcMem.c</div>
<div>index 0a3ceb9f71..79575b6f63 100644</div>
<div>--- a/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c</div>
<div>+++ b/MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c</div>
<div>@@ -250,6 +250,11 @@ UsbHcGetPciAddressForHostMem (</div>
<div>&nbsp; &nbsp;}</div>
<div>&nbsp;</div>
<div>&nbsp; &nbsp;ASSERT ((Block !=3D NULL));</div>
<div>+</div>
<div>+&nbsp; if (Block =3D=3D NULL) {</div>
<div>+&nbsp; &nbsp; return 0;</div>
<div>+&nbsp; }</div>
<div>+</div>
<div>&nbsp; &nbsp;//</div>
<div>&nbsp; &nbsp;// calculate the pci memory address for host memory addre=
ss.</div>
<div>&nbsp; &nbsp;//</div>
<div>@@ -536,6 +541,10 @@ UsbHcFreeMem (</div>
<div>&nbsp; &nbsp;//</div>
<div>&nbsp; &nbsp;ASSERT (Block !=3D NULL);</div>
<div>&nbsp;</div>
<div>+&nbsp; if (Block =3D=3D NULL) {</div>
<div>+&nbsp; &nbsp; return;</div>
<div>+&nbsp; }</div>
<div>+</div>
<div>&nbsp; &nbsp;//</div>
<div>&nbsp; &nbsp;// Release the current memory block if it is empty and no=
t the head</div>
<div>&nbsp; &nbsp;//</div>
<div>--</div>
<div>2.36.1.windows.1</div>

--bFL0dCYWJCDI4DBu75g1--