lkml.org 
[lkml]   [2023]   [Dec]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/3] module: Change module_enable_{nx/x/ro}() to more explicit names
    Date
    It's a bit puzzling to see a call to module_enable_nx() followed by a
    call to module_enable_x(). This is because one applies on text while
    the other applies on data.

    Change name to make that more clear.

    Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    ---
    kernel/module/internal.h | 6 +++---
    kernel/module/main.c | 8 ++++----
    kernel/module/strict_rwx.c | 6 +++---
    3 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/kernel/module/internal.h b/kernel/module/internal.h
    index a647ab17193d..4f1b98f011da 100644
    --- a/kernel/module/internal.h
    +++ b/kernel/module/internal.h
    @@ -322,9 +322,9 @@ static inline struct module *mod_find(unsigned long addr, struct mod_tree_root *
    }
    #endif /* CONFIG_MODULES_TREE_LOOKUP */

    -void module_enable_ro(const struct module *mod, bool after_init);
    -void module_enable_nx(const struct module *mod);
    -void module_enable_rox(const struct module *mod);
    +void module_enable_rodata_ro(const struct module *mod, bool after_init);
    +void module_enable_data_nx(const struct module *mod);
    +void module_enable_text_rox(const struct module *mod);
    int module_enforce_rwx_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
    char *secstrings, struct module *mod);

    diff --git a/kernel/module/main.c b/kernel/module/main.c
    index 1c8f328ca015..64662e55e275 100644
    --- a/kernel/module/main.c
    +++ b/kernel/module/main.c
    @@ -2568,7 +2568,7 @@ static noinline int do_init_module(struct module *mod)
    /* Switch to core kallsyms now init is done: kallsyms may be walking! */
    rcu_assign_pointer(mod->kallsyms, &mod->core_kallsyms);
    #endif
    - module_enable_ro(mod, true);
    + module_enable_rodata_ro(mod, true);
    mod_tree_remove_init(mod);
    module_arch_freeing_init(mod);
    for_class_mod_mem_type(type, init) {
    @@ -2733,9 +2733,9 @@ static int complete_formation(struct module *mod, struct load_info *info)
    module_bug_finalize(info->hdr, info->sechdrs, mod);
    module_cfi_finalize(info->hdr, info->sechdrs, mod);

    - module_enable_ro(mod, false);
    - module_enable_nx(mod);
    - module_enable_rox(mod);
    + module_enable_rodata_ro(mod, false);
    + module_enable_data_nx(mod);
    + module_enable_text_rox(mod);

    /*
    * Mark state as coming so strong_try_module_get() ignores us,
    diff --git a/kernel/module/strict_rwx.c b/kernel/module/strict_rwx.c
    index 9345b09f28a5..9b2d58a8d59d 100644
    --- a/kernel/module/strict_rwx.c
    +++ b/kernel/module/strict_rwx.c
    @@ -26,7 +26,7 @@ static void module_set_memory(const struct module *mod, enum mod_mem_type type,
    * CONFIG_STRICT_MODULE_RWX because they are needed regardless of whether we
    * are strict.
    */
    -void module_enable_rox(const struct module *mod)
    +void module_enable_text_rox(const struct module *mod)
    {
    for_class_mod_mem_type(type, text) {
    if (IS_ENABLED(CONFIG_STRICT_MODULE_RWX))
    @@ -36,7 +36,7 @@ void module_enable_rox(const struct module *mod)
    }
    }

    -void module_enable_ro(const struct module *mod, bool after_init)
    +void module_enable_rodata_ro(const struct module *mod, bool after_init)
    {
    if (!IS_ENABLED(CONFIG_STRICT_MODULE_RWX))
    return;
    @@ -52,7 +52,7 @@ void module_enable_ro(const struct module *mod, bool after_init)
    module_set_memory(mod, MOD_RO_AFTER_INIT, set_memory_ro);
    }

    -void module_enable_nx(const struct module *mod)
    +void module_enable_data_nx(const struct module *mod)
    {
    if (!IS_ENABLED(CONFIG_STRICT_MODULE_RWX))
    return;
    --
    2.41.0

    \
     
     \ /
      Last update: 2023-12-21 08:25    [W:5.319 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site