From 92afadf9f8d954e0476fc0509cc3c8c5d45393a0 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 29 Nov 2010 13:15:42 -0500 Subject: [PATCH] --- yaml --- r: 224090 b: refs/heads/master c: 94462ad3b14739d158a1ab87bb30008c1e5a6bc1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/module.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 760a5543e108..259bb9874fe2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26e20a108caca6231c6a5ec659f815a866904751 +refs/heads/master: 94462ad3b14739d158a1ab87bb30008c1e5a6bc1 diff --git a/trunk/kernel/module.c b/trunk/kernel/module.c index 562f665c721f..34e00b708fad 100644 --- a/trunk/kernel/module.c +++ b/trunk/kernel/module.c @@ -2816,18 +2816,6 @@ static struct module *load_module(void __user *umod, kfree(info.strmap); free_copy(&info); - /* Set RO and NX regions for core */ - set_section_ro_nx(mod->module_core, - mod->core_text_size, - mod->core_ro_size, - mod->core_size); - - /* Set RO and NX regions for init */ - set_section_ro_nx(mod->module_init, - mod->init_text_size, - mod->init_ro_size, - mod->init_size); - /* Done! */ trace_module_load(mod); return mod; @@ -2888,6 +2876,18 @@ SYSCALL_DEFINE3(init_module, void __user *, umod, blocking_notifier_call_chain(&module_notify_list, MODULE_STATE_COMING, mod); + /* Set RO and NX regions for core */ + set_section_ro_nx(mod->module_core, + mod->core_text_size, + mod->core_ro_size, + mod->core_size); + + /* Set RO and NX regions for init */ + set_section_ro_nx(mod->module_init, + mod->init_text_size, + mod->init_ro_size, + mod->init_size); + do_mod_ctors(mod); /* Start the module */ if (mod->init != NULL)