Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e17f907 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 preemption fix from Rusty Russell:
 "Turns out we should have always been disabling preemption here;
  someone finally caught it thanks to Peter Z's additional checks"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  module: Fix locking in symbol_put_addr()
parents 858e904b 275d7d44

kernel/module.c

+6 −2
Original line number Diff line number Diff line
@@ -1063,11 +1063,15 @@ void symbol_put_addr(void *addr) 
	if (core_kernel_text(a))

		return;



	/* module_text_address is safe here: we're supposed to have reference

	 * to module from symbol_get, so it can't go away. */

	/*

	 * Even though we hold a reference on the module; we still need to

	 * disable preemption in order to safely traverse the data structure.

	 */

	preempt_disable();

	modaddr = __module_text_address(a);

	BUG_ON(!modaddr);

	module_put(modaddr);

	preempt_enable();

}

EXPORT_SYMBOL_GPL(symbol_put_addr);