From ba2f977129f8d5c343d5cbc8ac05dba39b1e7ea0 Mon Sep 17 00:00:00 2001 From: Neal Liu Date: Thu, 22 Oct 2020 17:11:31 +0800 Subject: [PATCH] ANDROID: modules: fix suspicious rcu usage Use rcu_read_lock_sched() & rcu_read_unlock_sched() to mark the beginning & end of a RCU-sched critical section instead. Bug: 171362096 Signed-off-by: Neal Liu Change-Id: Idb40e2c2356621398e06944f7cb9b8bc5ef1d92a --- kernel/module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/module.c b/kernel/module.c index 60f6a995265c..36e15ead5a80 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -4348,10 +4348,10 @@ int module_kallsyms_on_each_symbol(int (*fn)(void *, const char *, static void cfi_init(struct module *mod) { #ifdef CONFIG_CFI_CLANG - rcu_read_lock(); + rcu_read_lock_sched(); mod->cfi_check = (cfi_check_fn)find_kallsyms_symbol_value(mod, CFI_CHECK_FN_NAME); - rcu_read_unlock(); + rcu_read_unlock_sched(); cfi_module_add(mod, module_addr_min, module_addr_max); #endif }