Now that set_all_modules_text_*() is gone, nothing depends on the relation between ->state = COMING and the protection state anymore. This enables moving the protection changes later, such that the COMING notifier callbacks can more easily modify the text.
Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Cc: Jessica Yu <[email protected]> --- kernel/module.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/kernel/module.c +++ b/kernel/module.c @@ -3683,10 +3683,6 @@ static int complete_formation(struct mod /* This relies on module_mutex for list integrity. */ module_bug_finalize(info->hdr, info->sechdrs, mod); - module_enable_ro(mod, false); - module_enable_nx(mod); - module_enable_x(mod); - /* Mark state as coming so strong_try_module_get() ignores us, * but kallsyms etc. can see us. */ mod->state = MODULE_STATE_COMING; @@ -3852,6 +3848,10 @@ static int load_module(struct load_info if (err) goto bug_cleanup; + module_enable_ro(mod, false); + module_enable_nx(mod); + module_enable_x(mod); + /* Module is ready to execute: parsing args may do that. */ after_dashes = parse_args(mod->name, mod->args, mod->kp, mod->num_kp, -32768, 32767, mod,
