Change in coreboot[master]: src/drivrs/usb: Avoid NULL pointer dereference

[John Zhao (Code Review)]

John Zhao has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43449 )

Change subject: src/drivrs/usb: Avoid NULL pointer dereference
......................................................................

src/drivrs/usb: Avoid NULL pointer dereference

Coverity detects dereferencing pointers that might be "NULL" when
calling acpigen_write_scope and acpigen_write_device. Add sanity
check for both of scope and name to prevent NULL pointer dereference.

Found-by: Coverity CID 1430454
TEST=Built and boot up to kernel.

Signed-off-by: John Zhao 
Change-Id: I8ece3831bbd2641ceafbd71b9dc3db7e04a8eae4
---
M src/drivers/usb/pci_xhci/pci_xhci.c
1 file changed, 7 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/43449/1

diff --git a/src/drivers/usb/pci_xhci/pci_xhci.c b/src/drivers/usb/pci_xhci/pci_xhci.c
index b787127..a375f07 100644
--- a/src/drivers/usb/pci_xhci/pci_xhci.c
+++ b/src/drivers/usb/pci_xhci/pci_xhci.c
@@ -187,11 +187,16 @@
 static void xhci_fill_ssdt(const struct device *dev)
 {
    int gpe;
+	const char *scope = acpi_device_scope(dev);
+	const char *name = acpi_device_name(dev);
+
+	if (!scope || !name)
+		return;

printk(BIOS_DEBUG, "xHCI SSDT generation\n");

-	acpigen_write_scope(acpi_device_scope(dev));
-	acpigen_write_device(acpi_device_name(dev));
+	acpigen_write_scope(scope);
+	acpigen_write_device(name);

acpigen_write_ADR_pci_device(dev);
    acpigen_write_name_string("_DDN", "xHC - Extensible Host Controller");

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43449 )

Change subject: src/drivrs/usb: Avoid NULL pointer dereference
......................................................................

Patch Set 1: Code-Review+2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43449 )

Change subject: src/drivrs/usb: Avoid NULL pointer dereference
......................................................................

Patch Set 1:

(3 comments)

https://review.coreboot.org/c/coreboot/+/43449/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/43449/1//COMMIT_MSG@7 
PS1, Line 7: drivrs
drivers

https://review.coreboot.org/c/coreboot/+/43449/1//COMMIT_MSG@7 
PS1, Line 7: src/
Please remove `src/` from the prefix.

https://review.coreboot.org/c/coreboot/+/43449/1//COMMIT_MSG@14 
PS1, Line 14: TEST=Built and boot up to kernel.
On what board?

Change in coreboot[master]: drivers/usb: Avoid NULL pointer dereference

[John Zhao (Code Review)]

Hello build bot (Jenkins), Tim Wawrzynczak,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/43449

to look at the new patch set (#2).

Change subject: drivers/usb: Avoid NULL pointer dereference
......................................................................

drivers/usb: Avoid NULL pointer dereference

Coverity detects dereferencing pointers that might be "NULL" when
calling acpigen_write_scope and acpigen_write_device. Add sanity
check for both of scope and name to prevent NULL pointer dereference.

Found-by: Coverity CID 1430454
TEST=Built and boot up to kernel on Volteer.

Signed-off-by: John Zhao 
Change-Id: I8ece3831bbd2641ceafbd71b9dc3db7e04a8eae4
---
M src/drivers/usb/pci_xhci/pci_xhci.c
1 file changed, 7 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/49/43449/2

Change in coreboot[master]: drivers/usb: Avoid NULL pointer dereference

[John Zhao (Code Review)]

John Zhao has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43449 )

Change subject: drivers/usb: Avoid NULL pointer dereference
......................................................................

Patch Set 2:

(3 comments)

https://review.coreboot.org/c/coreboot/+/43449/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/43449/1//COMMIT_MSG@7 
PS1, Line 7: drivrs
> drivers

Done

https://review.coreboot.org/c/coreboot/+/43449/1//COMMIT_MSG@7 
PS1, Line 7: src/
> Please remove `src/` from the prefix.

Done

https://review.coreboot.org/c/coreboot/+/43449/1//COMMIT_MSG@14 
PS1, Line 14: TEST=Built and boot up to kernel.
> On what board?

Done

Change in coreboot[master]: drivers/usb: Avoid NULL pointer dereference

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43449 )

Change subject: drivers/usb: Avoid NULL pointer dereference
......................................................................

Patch Set 2: Code-Review+2

Change in coreboot[master]: drivers/usb: Avoid NULL pointer dereference

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43449 )

Change subject: drivers/usb: Avoid NULL pointer dereference
......................................................................

drivers/usb: Avoid NULL pointer dereference

Coverity detects dereferencing pointers that might be "NULL" when
calling acpigen_write_scope and acpigen_write_device. Add sanity
check for both of scope and name to prevent NULL pointer dereference.

Found-by: Coverity CID 1430454
TEST=Built and boot up to kernel on Volteer.

Signed-off-by: John Zhao 
Change-Id: I8ece3831bbd2641ceafbd71b9dc3db7e04a8eae4
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43449
Reviewed-by: Angel Pons 
Reviewed-by: Tim Wawrzynczak 
Tested-by: build bot (Jenkins) 
---
M src/drivers/usb/pci_xhci/pci_xhci.c
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved
  Tim Wawrzynczak: Looks good to me, approved

diff --git a/src/drivers/usb/pci_xhci/pci_xhci.c b/src/drivers/usb/pci_xhci/pci_xhci.c
index b787127..a375f07 100644
--- a/src/drivers/usb/pci_xhci/pci_xhci.c
+++ b/src/drivers/usb/pci_xhci/pci_xhci.c
@@ -187,11 +187,16 @@
 static void xhci_fill_ssdt(const struct device *dev)
 {
    int gpe;
+	const char *scope = acpi_device_scope(dev);
+	const char *name = acpi_device_name(dev);
+
+	if (!scope || !name)
+		return;

printk(BIOS_DEBUG, "xHCI SSDT generation\n");

-	acpigen_write_scope(acpi_device_scope(dev));
-	acpigen_write_device(acpi_device_name(dev));
+	acpigen_write_scope(scope);
+	acpigen_write_device(name);

acpigen_write_ADR_pci_device(dev);
    acpigen_write_name_string("_DDN", "xHC - Extensible Host Controller");