Commit d92870dd authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina

HID: fix tty<->hid deadlock

hid_compat_load() runs on the default workqueue, it request_module(), it
execs modprobe, it exits, tty flushes default workqueue, it hangs, because
we are still in it.
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Tested-by: <Valdis.Kletnieks@vt.edu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent d1d3a5f6
...@@ -1657,6 +1657,7 @@ static void hid_compat_load(struct work_struct *ws) ...@@ -1657,6 +1657,7 @@ static void hid_compat_load(struct work_struct *ws)
request_module("hid-dummy"); request_module("hid-dummy");
} }
static DECLARE_WORK(hid_compat_work, hid_compat_load); static DECLARE_WORK(hid_compat_work, hid_compat_load);
static struct workqueue_struct *hid_compat_wq;
#endif #endif
static int __init hid_init(void) static int __init hid_init(void)
...@@ -1674,7 +1675,12 @@ static int __init hid_init(void) ...@@ -1674,7 +1675,12 @@ static int __init hid_init(void)
goto err_bus; goto err_bus;
#ifdef CONFIG_HID_COMPAT #ifdef CONFIG_HID_COMPAT
schedule_work(&hid_compat_work); hid_compat_wq = create_workqueue("hid_compat");
if (!hid_compat_wq) {
hidraw_exit();
goto err;
}
queue_work(hid_compat_wq, &hid_compat_work);
#endif #endif
return 0; return 0;
...@@ -1686,6 +1692,9 @@ static int __init hid_init(void) ...@@ -1686,6 +1692,9 @@ static int __init hid_init(void)
static void __exit hid_exit(void) static void __exit hid_exit(void)
{ {
#ifdef CONFIG_HID_COMPAT
destroy_workqueue(hid_compat_wq);
#endif
hidraw_exit(); hidraw_exit();
bus_unregister(&hid_bus_type); bus_unregister(&hid_bus_type);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment