Commit af742623 authored Dec 09, 2019 by Steven Rostedt (VMware)

module: Remove accidental change of module_enable_x()



When pulling in Divya Indi's patch, I made a minor fix to remove unneeded
braces. I commited my fix up via "git commit -a --amend". Unfortunately, I
didn't realize I had some changes I was testing in the module code, and
those changes were applied to Divya's patch as well.

This reverts the accidental updates to the module code.

Cc: Jessica Yu <jeyu@kernel.org>
Cc: Divya Indi <divya.indi@oracle.com>
Reported-by: Peter Zijlstra <peterz@infradead.org>
Fixes: e585e646 ("tracing: Verify if trace array exists before destroying it.")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent a356646a

kernel/module.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -3728,6 +3728,7 @@ static int complete_formation(struct module mod, struct load_info info)

		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. */
		@@ -3750,11 +3751,6 @@ static int prepare_coming_module(struct module *mod)
		if (err)
		return err;

		/* Make module executable after ftrace is enabled */
		mutex_lock(&module_mutex);
		module_enable_x(mod);
		mutex_unlock(&module_mutex);

		blocking_notifier_call_chain(&module_notify_list,
		MODULE_STATE_COMING, mod);
		return 0;

Admin message