Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | From | Christophe Leroy <> | Subject | [PATCH 2/3] modules: Remove #ifdef CONFIG_STRICT_MODULE_RWX around rodata_enabled | Date | Thu, 21 Dec 2023 10:02:47 +0100 |
| |
Now that rodata_enabled is declared at all time, the #ifdef CONFIG_STRICT_MODULE_RWX can be removed.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- kernel/module/strict_rwx.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/kernel/module/strict_rwx.c b/kernel/module/strict_rwx.c index a2b656b4e3d2..eadff63b6e80 100644 --- a/kernel/module/strict_rwx.c +++ b/kernel/module/strict_rwx.c @@ -34,12 +34,8 @@ void module_enable_x(const struct module *mod) void module_enable_ro(const struct module *mod, bool after_init) { - if (!IS_ENABLED(CONFIG_STRICT_MODULE_RWX)) - return; -#ifdef CONFIG_STRICT_MODULE_RWX - if (!rodata_enabled) + if (!IS_ENABLED(CONFIG_STRICT_MODULE_RWX) || !rodata_enabled) return; -#endif module_set_memory(mod, MOD_TEXT, set_memory_ro); module_set_memory(mod, MOD_INIT_TEXT, set_memory_ro); -- 2.41.0
| ![\](/images/icornerr.gif) |