Commit a83955bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cfi-v5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull clang cfi fix from Kees Cook:

 - Use rcu_read_{un}lock_sched_notrace to avoid recursion (Elliot Berman)

* tag 'cfi-v5.14-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  cfi: Use rcu_read_{un}lock_sched_notrace
parents 3b844826 14c4c8e4

kernel/cfi.c

+4 −4
Original line number Diff line number Diff line
@@ -248,9 +248,9 @@ static inline cfi_check_fn find_shadow_check_fn(unsigned long ptr) 
{

	cfi_check_fn fn;



	rcu_read_lock_sched();

	rcu_read_lock_sched_notrace();

	fn = ptr_to_check_fn(rcu_dereference_sched(cfi_shadow), ptr);

	rcu_read_unlock_sched();

	rcu_read_unlock_sched_notrace();



	return fn;

}
@@ -269,11 +269,11 @@ static inline cfi_check_fn find_module_check_fn(unsigned long ptr) 
	cfi_check_fn fn = NULL;

	struct module *mod;



	rcu_read_lock_sched();

	rcu_read_lock_sched_notrace();

	mod = __module_address(ptr);

	if (mod)

		fn = mod->cfi_check;

	rcu_read_unlock_sched();

	rcu_read_unlock_sched_notrace();



	return fn;

}