Skip to content

Commit 4e0a882

Browse files
M1chagregkh
authored andcommitted
usb: gadget: f_hid: move list and spinlock inits from bind to alloc
There was an issue when you did the following: - setup and bind an hid gadget - open /dev/hidg0 - use the resulting fd in EPOLL_CTL_ADD - unbind the UDC - bind the UDC - use the fd in EPOLL_CTL_DEL When CONFIG_DEBUG_LIST was enabled, a list_del corruption was reported within remove_wait_queue (via ep_remove_wait_queue). After some debugging I found out that the queues, which f_hid registers via poll_wait were the problem. These were initialized using init_waitqueue_head inside hidg_bind. So effectively, the bind function re-initialized the queues while there were still items in them. The solution is to move the initialization from hidg_bind to hidg_alloc to extend their lifetimes to the lifetime of the function instance. Additionally, I found many other possibly problematic init calls in the bind function, which I moved as well. Signed-off-by: Michael Zimmermann <sigmaepsilon92@gmail.com> Cc: stable <stable@kernel.org> Link: https://patch.msgid.link/20260331184844.2388761-1-sigmaepsilon92@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5abbe6e commit 4e0a882

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

drivers/usb/gadget/function/f_hid.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,17 +1262,8 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f)
12621262
if (status)
12631263
goto fail;
12641264

1265-
spin_lock_init(&hidg->write_spinlock);
12661265
hidg->write_pending = 1;
12671266
hidg->req = NULL;
1268-
spin_lock_init(&hidg->read_spinlock);
1269-
spin_lock_init(&hidg->get_report_spinlock);
1270-
init_waitqueue_head(&hidg->write_queue);
1271-
init_waitqueue_head(&hidg->read_queue);
1272-
init_waitqueue_head(&hidg->get_queue);
1273-
init_waitqueue_head(&hidg->get_id_queue);
1274-
INIT_LIST_HEAD(&hidg->completed_out_req);
1275-
INIT_LIST_HEAD(&hidg->report_list);
12761267

12771268
INIT_WORK(&hidg->work, get_report_workqueue_handler);
12781269
hidg->workqueue = alloc_workqueue("report_work",
@@ -1608,6 +1599,16 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi)
16081599

16091600
mutex_lock(&opts->lock);
16101601

1602+
spin_lock_init(&hidg->write_spinlock);
1603+
spin_lock_init(&hidg->read_spinlock);
1604+
spin_lock_init(&hidg->get_report_spinlock);
1605+
init_waitqueue_head(&hidg->write_queue);
1606+
init_waitqueue_head(&hidg->read_queue);
1607+
init_waitqueue_head(&hidg->get_queue);
1608+
init_waitqueue_head(&hidg->get_id_queue);
1609+
INIT_LIST_HEAD(&hidg->completed_out_req);
1610+
INIT_LIST_HEAD(&hidg->report_list);
1611+
16111612
device_initialize(&hidg->dev);
16121613
hidg->dev.release = hidg_release;
16131614
hidg->dev.class = &hidg_class;

0 commit comments

Comments
 (0)