Commit a788e53c authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

usb: usb-acpi: Fix oops due to freeing uninitialized pld pointer 



If reading the ACPI _PLD port location object fails, or the port
doesn't have a _PLD ACPI object then the *pld pointer will remain
uninitialized and oops when freed.

The patch that caused this is currently in next, on its way to v6.9.
So no need to add this to stable or current 6.8 kernel.

Reported-by: default avatarKlara Modin <klarasmodin@gmail.com>
Closes: https://lore.kernel.org/linux-usb/7e92369a-3197-4883-9988-3c93452704f5@gmail.com/


Tested-by: default avatarKlara Modin <klarasmodin@gmail.com>
Fixes: f3ac348e ("usb: usb-acpi: Set port connect type of not connectable ports correctly")
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20240308113425.1144689-1-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d99e42ce

drivers/usb/core/usb-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 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 };

	union acpi_object *upc = NULL;

	struct acpi_pld_info *pld;

	struct acpi_pld_info *pld = NULL;

	acpi_status status;



	/*