From: julian-lagattuta <julian.lagattuta@gmail.com>
To: Luis Chamberlain <mcgrof@kernel.org>, Petr Pavlu <petr.pavlu@suse.com>
Cc: Sami Tolvanen <samitolvanen@google.com>,
Daniel Gomez <da.gomez@samsung.com>,
linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org,
julian-lagattuta <julian.lagattuta@gmail.com>
Subject: [PATCH 4/6] module: move idempotent allocation to heap
Date: Thu, 18 Sep 2025 16:11:12 -0400 [thread overview]
Message-ID: <20250918201109.24620-10-julian.lagattuta@gmail.com> (raw)
In-Reply-To: <20250918201109.24620-2-julian.lagattuta@gmail.com>
struct idempotent is normally allocated on the stack.
If init crashes during a finit_module syscall and then the module is unloaded,
reloading the module causes issues. This is because the struct idempotent stored
in the list becomes stale after the crash.
Therefore idempotent is stored on the heap and placed inside the struct module
to be completed by delete_module.
I am open to the idea of only storing it in the heap when
CONFIG_MODULE_FORCE_UNLOAD is enabled; however, simple seemed better.
Signed-off-by: julian-lagattuta <julian.lagattuta@gmail.com>
---
kernel/module/main.c | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
diff --git a/kernel/module/main.c b/kernel/module/main.c
index 2825ac177c62..217185dbc3c1 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -3650,6 +3650,8 @@ static int idempotent_complete(struct idempotent *u, int ret)
complete(&pos->complete);
}
spin_unlock(&idem_lock);
+
+ kfree(u);
return ret;
}
@@ -3666,13 +3668,19 @@ static int idempotent_complete(struct idempotent *u, int ret)
*/
static int idempotent_wait_for_completion(struct idempotent *u)
{
+ int ret;
+
if (wait_for_completion_interruptible(&u->complete)) {
spin_lock(&idem_lock);
if (!hlist_unhashed(&u->entry))
hlist_del(&u->entry);
spin_unlock(&idem_lock);
}
- return u->ret;
+ ret = u->ret;
+
+ kfree(u);
+
+ return ret;
}
static int init_module_from_file(struct file *f, const char __user * uargs, int flags)
@@ -3705,21 +3713,26 @@ static int init_module_from_file(struct file *f, const char __user * uargs, int
static int idempotent_init_module(struct file *f, const char __user * uargs, int flags)
{
- struct idempotent idem;
+ struct idempotent *idem;
+
+ idem = kmalloc(sizeof(*idem), GFP_KERNEL);
+ if (!idem)
+ return -ENOMEM;
+
if (!(f->f_mode & FMODE_READ))
return -EBADF;
/* Are we the winners of the race and get to do this? */
- if (!idempotent(&idem, file_inode(f))) {
- int ret = init_module_from_file(f, uargs, flags);
- return idempotent_complete(&idem, ret);
+ if (!idempotent(idem, file_inode(f))) {
+ int ret = init_module_from_file(f, uargs, flags, idem);
+ return idempotent_complete(idem, ret);
}
/*
* Somebody else won the race and is loading the module.
*/
- return idempotent_wait_for_completion(&idem);
+ return idempotent_wait_for_completion(idem);
}
SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
--
2.45.2
next prev parent reply other threads:[~2025-09-18 20:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-18 20:11 [PATCH 0/6] module: enable force unloading of modules that have crashed during init julian-lagattuta
2025-09-18 20:11 ` [PATCH 1/6] module: store init_pid and idempotent in module julian-lagattuta
2025-09-18 20:11 ` [PATCH 2/6] module: detect if init crashed and unload julian-lagattuta
2025-09-18 20:11 ` [PATCH 3/6] module: move freeinit allocation to avoid memory leak julian-lagattuta
2025-09-18 20:11 ` julian-lagattuta [this message]
2025-09-18 20:11 ` [PATCH 5/6] module: store and complete idempotent upon force unloading julian-lagattuta
2025-09-18 20:11 ` [PATCH 6/6] module: comment describing new codepath julian-lagattuta
2025-09-23 7:21 ` [PATCH 0/6] module: enable force unloading of modules that have crashed during init Petr Pavlu
2025-09-24 22:16 ` Julian LaGattuta
2025-09-30 13:16 ` Petr Pavlu
2025-09-30 15:51 ` Julian LaGattuta
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=20250918201109.24620-10-julian.lagattuta@gmail.com \
--to=julian.lagattuta@gmail.com \
--cc=da.gomez@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=petr.pavlu@suse.com \
--cc=samitolvanen@google.com \
/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
all inboxes | Powered by JetHome®