summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMiroslav Benes <mbenes@suse.cz>2020-10-27 15:03:36 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-09 13:37:38 +0100
commit22d29be48cef12cd97beac20bf0431a326847b02 (patch)
treeb0853830c5a14eb0c1a341c91d5b8af08c60ee2a /kernel
parent3ce2fd56bb342f15cc2184ec321610546bfe6f26 (diff)
module: set MODULE_STATE_GOING state when a module fails to load
[ Upstream commit 5e8ed280dab9eeabc1ba0b2db5dbe9fe6debb6b5 ] If a module fails to load due to an error in prepare_coming_module(), the following error handling in load_module() runs with MODULE_STATE_COMING in module's state. Fix it by correctly setting MODULE_STATE_GOING under "bug_cleanup" label. Signed-off-by: Miroslav Benes <mbenes@suse.cz> Signed-off-by: Jessica Yu <jeyu@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/module.c b/kernel/module.c
index 2806c9b6577c..c4f0a8fe144e 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3801,6 +3801,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
MODULE_STATE_GOING, mod);
klp_module_going(mod);
bug_cleanup:
+ mod->state = MODULE_STATE_GOING;
/* module_bug_cleanup needs module_mutex protection */
mutex_lock(&module_mutex);
module_bug_cleanup(mod);