From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Miroslav Benes <mbenes@suse.cz>, Jessica Yu <jeyu@kernel.org>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 4.19 03/10] module: set MODULE_STATE_GOING state when a module fails to load
Date: Wed, 30 Dec 2020 08:04:15 -0500 [thread overview]
Message-ID: <20201230130422.3637448-3-sashal@kernel.org> (raw)
In-Reply-To: <20201230130422.3637448-1-sashal@kernel.org>
From: Miroslav Benes <mbenes@suse.cz>
[ 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 | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/module.c b/kernel/module.c
index d05e1bfdd3559..8dbe0ff22134e 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3841,6 +3841,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);
--
2.27.0
next prev parent reply other threads:[~2020-12-30 13:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-30 13:04 [PATCH AUTOSEL 4.19 01/10] ARM: 9014/2: Replace string mem* functions for KASan Sasha Levin
2020-12-30 13:04 ` [PATCH AUTOSEL 4.19 02/10] rtc: sun6i: Fix memleak in sun6i_rtc_clk_init Sasha Levin
2020-12-30 13:04 ` Sasha Levin [this message]
2020-12-30 13:04 ` [PATCH AUTOSEL 4.19 04/10] quota: Don't overflow quota file offsets Sasha Levin
2020-12-30 13:04 ` [PATCH AUTOSEL 4.19 05/10] powerpc: sysdev: add missing iounmap() on error in mpic_msgr_probe() Sasha Levin
2020-12-30 13:04 ` [PATCH AUTOSEL 4.19 06/10] reiserfs: add check for an invalid ih_entry_count Sasha Levin
2020-12-30 13:04 ` [PATCH AUTOSEL 4.19 07/10] NFSv4: Fix a pNFS layout related use-after-free race when freeing the inode Sasha Levin
2020-12-30 13:04 ` [PATCH AUTOSEL 4.19 08/10] module: delay kobject uevent until after module init call Sasha Levin
2020-12-30 13:04 ` [PATCH AUTOSEL 4.19 09/10] ALSA: pcm: Clear the full allocated memory at hw_params Sasha Levin
2020-12-30 13:04 ` [PATCH AUTOSEL 4.19 10/10] dm verity: skip verity work if I/O error when system is shutting down Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201230130422.3637448-3-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mbenes@suse.cz \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome