]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
usb: gadget: Fix setting self-powered state on suspend
authorMarek Szyprowski <m.szyprowski@samsung.com>
Thu, 20 Feb 2025 12:03:14 +0000 (13:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 11:47:41 +0000 (12:47 +0100)
commit c783e1258f29c5caac9eea0aea6b172870f1baf8 upstream.

cdev->config might be NULL, so check it before dereferencing.

CC: stable <stable@kernel.org>
Fixes: 40e89ff5750f ("usb: gadget: Set self-powered based on MaxPower and bmAttributes")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20250220120314.3614330-1-m.szyprowski@samsung.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/gadget/composite.c

index b3202e432f80af1341923f91b804c498eb2e52cf..daa42e5fe2e7df6b95703c4f23d01556d1823cae 100644 (file)
@@ -2366,7 +2366,8 @@ void composite_suspend(struct usb_gadget *gadget)
 
        cdev->suspended = 1;
 
-       if (cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER)
+       if (cdev->config &&
+           cdev->config->bmAttributes & USB_CONFIG_ATT_SELFPOWER)
                usb_gadget_set_selfpowered(gadget);
 
        usb_gadget_vbus_draw(gadget, 2);