2024-03-15 15:23:05

by Dan Carpenter

[permalink] [raw]
Subject: [PATCH] usb: usb-acpi: fix uninitialized variable in usb_acpi_get_connect_type()

The "pld" pointer is uninitialized if acpi_get_physical_device_location()
fails. Initialize it to NULL.

Fixes: f3ac348e6e04 ("usb: usb-acpi: Set port connect type of not connectable ports correctly")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/usb/core/usb-acpi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
index f250dfc3b14d..2aeeaa389380 100644
--- a/drivers/usb/core/usb-acpi.c
+++ b/drivers/usb/core/usb-acpi.c
@@ -153,8 +153,8 @@ usb_acpi_get_connect_type(struct usb_port *port_dev, acpi_handle *handle)
{
enum usb_port_connect_type connect_type = USB_PORT_CONNECT_TYPE_UNKNOWN;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+ struct acpi_pld_info *pld = NULL;
union acpi_object *upc = NULL;
- struct acpi_pld_info *pld;
acpi_status status;

/*
--
2.43.0



2024-03-15 18:44:18

by Dan Carpenter

[permalink] [raw]
Subject: Re: [PATCH] usb: usb-acpi: fix uninitialized variable in usb_acpi_get_connect_type()

On Fri, Mar 15, 2024 at 05:36:16PM +0200, Mathias Nyman wrote:
> On 15.3.2024 17.21, Dan Carpenter wrote:
> > The "pld" pointer is uninitialized if acpi_get_physical_device_location()
> > fails. Initialize it to NULL.
> >
> > Fixes: f3ac348e6e04 ("usb: usb-acpi: Set port connect type of not connectable ports correctly")
> > Signed-off-by: Dan Carpenter <[email protected]>
> > ---
>
> I sent a similar patch a week ago, just before merge window opened.
> looks like it didn't make it.
>
> https://lore.kernel.org/linux-usb/[email protected]/

Huh. That's interesting that this bug was causing issues in real life.
I thought everyone was using the GCC extension to zero stack variables.
I've only been fixing uninitialized variable bugs out of sense of
stubbornness and to boost my patch count. :P

regards,
dan carpenter


2024-03-15 19:11:18

by Mathias Nyman

[permalink] [raw]
Subject: Re: [PATCH] usb: usb-acpi: fix uninitialized variable in usb_acpi_get_connect_type()

On 15.3.2024 17.21, Dan Carpenter wrote:
> The "pld" pointer is uninitialized if acpi_get_physical_device_location()
> fails. Initialize it to NULL.
>
> Fixes: f3ac348e6e04 ("usb: usb-acpi: Set port connect type of not connectable ports correctly")
> Signed-off-by: Dan Carpenter <[email protected]>
> ---

I sent a similar patch a week ago, just before merge window opened.
looks like it didn't make it.

https://lore.kernel.org/linux-usb/[email protected]/

Thanks
Mathias