Skip to content

Commit

Permalink
module: Clean up ro/nx after early module load failures
Browse files Browse the repository at this point in the history
The commit

    4982223 module: set nx before marking module MODULE_STATE_COMING.

introduced a regression: if a module fails to parse its arguments or
if mod_sysfs_setup fails, then the module's memory will be freed
while still read-only.  Anything that reuses that memory will crash
as soon as it tries to write to it.

Cc: stable@vger.kernel.org # v3.16
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  • Loading branch information
Andy Lutomirski authored and Rusty Russell committed Aug 15, 2014
1 parent c9d2642 commit ff7e005
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions kernel/module.c
Original file line number Diff line number Diff line change
@@ -3304,6 +3304,11 @@ static int load_module(struct load_info *info, const char __user *uargs,
mutex_lock(&module_mutex);
module_bug_cleanup(mod);
mutex_unlock(&module_mutex);

/* we can't deallocate the module until we clear memory protection */
unset_module_init_ro_nx(mod);
unset_module_core_ro_nx(mod);

ddebug_cleanup:
dynamic_debug_remove(info->debug);
synchronize_sched();

0 comments on commit ff7e005

Please sign in to comment.