]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
usb: gadget: composite: fix dead empty check in the USB_DT_OTG handler
authorMaoyi Xie <maoyixie.tju@gmail.com>
Wed, 27 May 2026 15:08:32 +0000 (23:08 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jun 2026 15:03:54 +0000 (16:03 +0100)
The OTG branch of composite_setup() falls back to the first
configuration when none is selected:

if (cdev->config)
config = cdev->config;
else
config = list_first_entry(&cdev->configs,
  struct usb_configuration, list);
if (!config)
goto done;
...
memcpy(req->buf, config->descriptors[0], value);

list_first_entry() never returns NULL. On an empty list it returns
container_of() of the list head. So the "if (!config)" check is dead.

When cdev->configs is empty, config points at the head inside struct
usb_composite_dev. config->descriptors[0] reads whatever sits at that
offset. The memcpy copies up to w_length bytes of it into the response
buffer.

cdev->configs can be empty in two cases. One is a teardown race on
gadget unbind with a control transfer in flight. The other is a driver
that sets is_otg before it adds a config. A reproducer that holds
cdev->configs empty triggers a KASAN fault in this branch.

Use list_first_entry_or_null() so the existing check does its job.

Fixes: 53e6242db8d6 ("usb: gadget: composite: add USB_DT_OTG request handling")
Cc: stable <stable@kernel.org>
Signed-off-by: Maoyi Xie <maoyixie.tju@gmail.com>
Link: https://patch.msgid.link/20260527150832.2943293-1-maoyixie.tju@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/composite.c

index dc3664374596351c39f5364845ccd5f4b8558403..df39e3487c1f3b03c7105f8933a7faf201bd6069 100644 (file)
@@ -1863,9 +1863,10 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
                                if (cdev->config)
                                        config = cdev->config;
                                else
-                                       config = list_first_entry(
+                                       config = list_first_entry_or_null(
                                                        &cdev->configs,
-                                               struct usb_configuration, list);
+                                                       struct usb_configuration,
+                                                       list);
                                if (!config)
                                        goto done;