|
@@ -3020,21 +3020,6 @@ static int do_init_module(struct module *mod)
|
|
|
*/
|
|
|
current->flags &= ~PF_USED_ASYNC;
|
|
|
|
|
|
- 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)
|
|
@@ -3165,9 +3150,26 @@ static int complete_formation(struct module *mod, struct load_info *info)
|
|
|
/* This relies on module_mutex for list integrity. */
|
|
|
module_bug_finalize(info->hdr, info->sechdrs, 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);
|
|
|
+
|
|
|
/* Mark state as coming so strong_try_module_get() ignores us,
|
|
|
* but kallsyms etc. can see us. */
|
|
|
mod->state = MODULE_STATE_COMING;
|
|
|
+ mutex_unlock(&module_mutex);
|
|
|
+
|
|
|
+ blocking_notifier_call_chain(&module_notify_list,
|
|
|
+ MODULE_STATE_COMING, mod);
|
|
|
+ return 0;
|
|
|
|
|
|
out:
|
|
|
mutex_unlock(&module_mutex);
|
|
@@ -3190,6 +3192,7 @@ static int load_module(struct load_info *info, const char __user *uargs,
|
|
|
{
|
|
|
struct module *mod;
|
|
|
long err;
|
|
|
+ char *after_dashes;
|
|
|
|
|
|
err = module_sig_check(info);
|
|
|
if (err)
|
|
@@ -3277,10 +3280,15 @@ static int load_module(struct load_info *info, const char __user *uargs,
|
|
|
goto ddebug_cleanup;
|
|
|
|
|
|
/* Module is ready to execute: parsing args may do that. */
|
|
|
- err = parse_args(mod->name, mod->args, mod->kp, mod->num_kp,
|
|
|
- -32768, 32767, unknown_module_param_cb);
|
|
|
- if (err < 0)
|
|
|
+ after_dashes = parse_args(mod->name, mod->args, mod->kp, mod->num_kp,
|
|
|
+ -32768, 32767, unknown_module_param_cb);
|
|
|
+ if (IS_ERR(after_dashes)) {
|
|
|
+ err = PTR_ERR(after_dashes);
|
|
|
goto bug_cleanup;
|
|
|
+ } else if (after_dashes) {
|
|
|
+ pr_warn("%s: parameters '%s' after `--' ignored\n",
|
|
|
+ mod->name, after_dashes);
|
|
|
+ }
|
|
|
|
|
|
/* Link in to syfs. */
|
|
|
err = mod_sysfs_setup(mod, info, mod->kp, mod->num_kp);
|