Commit 6fedb0ff authored Aug 16, 2014 by Linus Torvalds

linux

Pull module fix from Rusty Russell:
 "Nasty potential bug if someone uses a known module param with an
  invalid value (we don't fail unknown module params any more, just
  warn)"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  module: Clean up ro/nx after early module load failures

parents 90c80969 ff7e0055

kernel/module.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -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();

Admin message