]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
module: set MODULE_STATE_GOING state when a module fails to load
authorMiroslav Benes <mbenes@suse.cz>
Tue, 27 Oct 2020 14:03:36 +0000 (15:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 Jan 2021 12:37:38 +0000 (13:37 +0100)
[ 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>
kernel/module.c

index 2806c9b6577c153e1315191a20df9d2491e5b6cf..c4f0a8fe144e12e77913852977eae12378dc2006 100644 (file)
@@ -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);