[1/1] kernel/module.c: wakeup processes in module_wq on module unload

Submitted by Konstantin Khorenko on Nov. 13, 2019, 9:36 a.m.

Details

Message ID 20191113093656.15674-2-khorenko@virtuozzo.com
State New
Series "kernel/module.c: don't allow modprobe to hang forever on a module load"
Headers show

Commit Message

Konstantin Khorenko Nov. 13, 2019, 9:36 a.m. 
Fix the race between load and unload a kernel module.

sys_delete_module()
 try_stop_module()
  mod->state = _GOING
					add_unformed_module()
					 old = find_module_all()
					 (old->state == _GOING =>
					  wait_event_interruptible())

					 During pre-condition
					 finished_loading() rets 0
					 schedule()
					 (never gets waken up later)
 free_module()
  mod->state = _UNFORMED
   list_del_rcu(&mod->list)
   (dels mod from "modules" list)

return

The race above leads to modprobe hanging forever on loading
a module.

Error paths on loading module call wake_up_all(&module_wq) after
freeing module, so let's do the same on straight module unload.

Fixes: ms commit 6e6de3dee51a ("kernel/module.c: Only return
-EEXIST for modules that have finished loading")

https://jira.sw.ru/browse/PSBM-99356

Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 kernel/module.c | 2 ++
 1 file changed, 2 insertions(+)

Patch hide | download patch | download mbox 

diff --git a/kernel/module.c b/kernel/module.c
index ff2d7359a418..cb09a5f37a5f 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1033,6 +1033,8 @@  SYSCALL_DEFINE2(delete_module, const char __user *, name_user,
 	strlcpy(last_unloaded_module, mod->name, sizeof(last_unloaded_module));
 
 	free_module(mod);
+	/* someone could wait for the module in add_unformed_module() */
+	wake_up_all(&module_wq);
 	return 0;
 out:
 	mutex_unlock(&module_mutex);