Commit 5b2a0eee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 

Pull module fix from Rusty Russell:
 "Single overzealous locking assertion fix"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  module: weaken locking assertion for oops path.
parents 74d33293 fe0d34d2

kernel/module.c

+6 −2
Original line number Diff line number Diff line
@@ -602,13 +602,16 @@ const struct kernel_symbol *find_symbol(const char *name, 
}

EXPORT_SYMBOL_GPL(find_symbol);



/* Search for module by name: must hold module_mutex. */

/*

 * Search for module by name: must hold module_mutex (or preempt disabled

 * for read-only access).

 */

static struct module *find_module_all(const char *name, size_t len,

				      bool even_unformed)

{

	struct module *mod;



	module_assert_mutex();

	module_assert_mutex_or_preempt();



	list_for_each_entry(mod, &modules, list) {

		if (!even_unformed && mod->state == MODULE_STATE_UNFORMED)
@@ -621,6 +624,7 @@ static struct module *find_module_all(const char *name, size_t len, 


struct module *find_module(const char *name)

{

	module_assert_mutex();

	return find_module_all(name, strlen(name), false);

}

EXPORT_SYMBOL_GPL(find_module);