From: Petr Pavlu <petr.pavlu@suse.com>
To: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Luis Chamberlain <mcgrof@kernel.org>,
Sami Tolvanen <samitolvanen@google.com>,
Daniel Gomez <da.gomez@samsung.com>, Kees Cook <kees@kernel.org>,
linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [RFC PATCH 2/3] module: Don't fail module loading when setting ro_after_init section RO failed
Date: Mon, 11 Nov 2024 18:05:52 +0100 [thread overview]
Message-ID: <f2c8b587-117b-401d-a5ab-ae59dae1dfd3@suse.com> (raw)
In-Reply-To: <164e5f22f8ab59d1d516e3c992efdd9f83ab4819.1731148254.git.christophe.leroy@csgroup.eu>
On 11/9/24 11:35, Christophe Leroy wrote:
> Once module init has succeded it is too late to cancel loading.
> If setting ro_after_init data section to read-only fails, all we
> can do is to inform the user through a warning.
Makes sense to me. If I'm looking correctly, set_memory_ro() could
mostly fail when splitting large pages. If we wanted to fix this
cleanly, I wonder if it would be possible to divide the function into
two. The first one which does the necessary splitting, can fail and is
called prior to a module init, and the second one that eventually
updates page table attributes and is called after the init.
>
> Reported-by: Thomas Gleixner <tglx@linutronix.de>
> Closes: https://lore.kernel.org/all/20230915082126.4187913-1-ruanjinjie@huawei.com/
> Fixes: d1909c022173 ("module: Don't ignore errors from set_memory_XX()")
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> ---
> kernel/module/main.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/module/main.c b/kernel/module/main.c
> index 2de4ad7af335..1bf4b0db291b 100644
> --- a/kernel/module/main.c
> +++ b/kernel/module/main.c
> @@ -2583,7 +2583,9 @@ static noinline int do_init_module(struct module *mod)
> #endif
> ret = module_enable_rodata_ro_after_init(mod);
> if (ret)
> - goto fail_mutex_unlock;
> + pr_warn("%s: %s() returned %d, ro_after_init data might still be writable\n",
> + mod->name, __func__, ret);
> +
The __func__ magic constant here expands to "do_init_module" but the
message should rather say that "module_enable_rodata_ro_after_init"
failed.
> mod_tree_remove_init(mod);
> module_arch_freeing_init(mod);
> for_class_mod_mem_type(type, init) {
> @@ -2622,8 +2624,6 @@ static noinline int do_init_module(struct module *mod)
>
> return 0;
>
> -fail_mutex_unlock:
> - mutex_unlock(&module_mutex);
> fail_free_freeinit:
> kfree(freeinit);
> fail:
--
Cheers,
Petr
next prev parent reply other threads:[~2024-11-11 17:05 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20241109103551eucas1p1bddb2f2d9a898aba967868dece7cd685@eucas1p1.samsung.com>
2024-11-09 10:35 ` [RFC PATCH 1/3] module: Split module_enable_rodata_ro() Christophe Leroy
2024-11-09 10:35 ` [RFC PATCH 2/3] module: Don't fail module loading when setting ro_after_init section RO failed Christophe Leroy
2024-11-09 22:17 ` Daniel Gomez
2024-11-11 18:53 ` Christophe Leroy
2024-11-12 9:43 ` Daniel Gomez
2024-11-12 11:08 ` Christophe Leroy
2024-11-12 14:35 ` Petr Pavlu
2024-11-28 20:23 ` Daniel Gomez
2024-12-04 15:14 ` Petr Pavlu
2024-12-10 10:49 ` Daniel Gomez
2024-12-11 8:46 ` Daniel Gomez
2025-01-03 15:40 ` Petr Pavlu
2025-01-04 7:42 ` Christophe Leroy
2024-11-11 17:05 ` Petr Pavlu [this message]
2024-11-09 10:35 ` [RFC PATCH 3/3] module: pre-test setting ro_after_init data read-only Christophe Leroy
2024-11-09 21:03 ` Daniel Gomez
2024-11-11 18:55 ` Christophe Leroy
2024-11-12 20:28 ` Luis Chamberlain
2024-11-13 6:49 ` Christophe Leroy
2024-11-13 9:56 ` Luis Chamberlain
2024-11-09 22:18 ` [RFC PATCH 1/3] module: Split module_enable_rodata_ro() Daniel Gomez
2024-11-26 19:58 ` Luis Chamberlain
2024-11-27 13:37 ` Christophe Leroy
2024-11-27 18:55 ` Luis Chamberlain
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=f2c8b587-117b-401d-a5ab-ae59dae1dfd3@suse.com \
--to=petr.pavlu@suse.com \
--cc=christophe.leroy@csgroup.eu \
--cc=da.gomez@samsung.com \
--cc=kees@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=samitolvanen@google.com \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).