5.15-stable patches

added patches:
	usb-gadget-core-adjust-uevent-timing-on-gadget-unbind.patch

diff --git a/queue-5.15/series b/queue-5.15/series
index 5eb2893e831284de6edc3242ff00a39e7620ef9e..3a1ffdaa565ff5d9184833d7d847a6c751224cf2 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -83,3 +83,4 @@ ring-buffer-fix-writing-to-the-buffer-with-max_data_size.patch
 ring-buffer-fix-a-race-in-rb_time_cmpxchg-for-32-bit-archs.patch
 ring-buffer-do-not-try-to-put-back-write_stamp.patch
 ksmbd-check-the-validation-of-pdu_size-in-ksmbd_conn_handler_loop.patch
+usb-gadget-core-adjust-uevent-timing-on-gadget-unbind.patch

diff --git a/queue-5.15/usb-gadget-core-adjust-uevent-timing-on-gadget-unbind.patch b/queue-5.15/usb-gadget-core-adjust-uevent-timing-on-gadget-unbind.patch
new file mode 100644 (file)
index 0000000..ef5f503
--- /dev/null
+++ b/queue-5.15/usb-gadget-core-adjust-uevent-timing-on-gadget-unbind.patch
@@ -0,0 +1,46 @@
+From 73ea73affe8622bdf292de898da869d441da6a9d Mon Sep 17 00:00:00 2001
+From: Roy Luo <royluo@google.com>
+Date: Tue, 28 Nov 2023 22:17:56 +0000
+Subject: USB: gadget: core: adjust uevent timing on gadget unbind
+
+From: Roy Luo <royluo@google.com>
+
+commit 73ea73affe8622bdf292de898da869d441da6a9d upstream.
+
+The KOBJ_CHANGE uevent is sent before gadget unbind is actually
+executed, resulting in inaccurate uevent emitted at incorrect timing
+(the uevent would have USB_UDC_DRIVER variable set while it would
+soon be removed).
+Move the KOBJ_CHANGE uevent to the end of the unbind function so that
+uevent is sent only after the change has been made.
+
+Fixes: 2ccea03a8f7e ("usb: gadget: introduce UDC Class")
+Cc: stable@vger.kernel.org
+Signed-off-by: Roy Luo <royluo@google.com>
+Link: https://lore.kernel.org/r/20231128221756.2591158-1-royluo@google.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/usb/gadget/udc/core.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/gadget/udc/core.c
++++ b/drivers/usb/gadget/udc/core.c
+@@ -1451,8 +1451,6 @@ static void usb_gadget_remove_driver(str
+       dev_dbg(&udc->dev, "unregistering UDC driver [%s]\n",
+                       udc->driver->function);
+ 
+-      kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
+-
+       usb_gadget_disconnect(udc->gadget);
+       usb_gadget_disable_async_callbacks(udc);
+       if (udc->gadget->irq)
+@@ -1462,6 +1460,8 @@ static void usb_gadget_remove_driver(str
+ 
+       udc->driver = NULL;
+       udc->gadget->dev.driver = NULL;
++
++      kobject_uevent(&udc->dev.kobj, KOBJ_CHANGE);
+ }
+ 
+ /**