Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: core: Fix crash w/ usb_choose_configuration() if no driver

It's possible that usb_choose_configuration() can get called when a
USB device has no driver. In this case the recent commit a87b8e3be926
("usb: core: Allow subclassed USB drivers to override
usb_choose_configuration()") can cause a crash since it dereferenced
the driver structure without checking for NULL. Let's add a check.

A USB device with no driver is an anomaly, so make
usb_choose_configuration() return immediately if there is no driver.

This was seen in the real world when usbguard got ahold of a r8152
device at the wrong time. It can also be simulated via this on a
computer with one r8152-based USB Ethernet adapter:
cd /sys/bus/usb/drivers/r8152-cfgselector
to_unbind="$(ls -d *-*)"
real_dir="$(readlink -f "${to_unbind}")"
echo "${to_unbind}" > unbind
cd "${real_dir}"
echo 0 > authorized
echo 1 > authorized

Fixes: a87b8e3be926 ("usb: core: Allow subclassed USB drivers to override usb_choose_configuration()")
Reviewed-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Link: https://lore.kernel.org/r/20231211073237.v3.1.If27eb3bf7812f91ab83810f232292f032f4203e0@changeid
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Douglas Anderson and committed by
Greg Kroah-Hartman
44995e6f 7d530f4c

+10 -1
+10 -1
drivers/usb/core/generic.c
··· 59 59 int num_configs; 60 60 int insufficient_power = 0; 61 61 struct usb_host_config *c, *best; 62 - struct usb_device_driver *udriver = to_usb_device_driver(udev->dev.driver); 62 + struct usb_device_driver *udriver; 63 + 64 + /* 65 + * If a USB device (not an interface) doesn't have a driver then the 66 + * kernel has no business trying to select or install a configuration 67 + * for it. 68 + */ 69 + if (!udev->dev.driver) 70 + return -1; 71 + udriver = to_usb_device_driver(udev->dev.driver); 63 72 64 73 if (usb_device_is_owned(udev)) 65 74 return 0;