summaryrefslogtreecommitdiffstats
path: root/tools/objtool
diff options
context:
space:
mode:
authorMarco Elver <elver@google.com>2020-03-25 17:41:57 +0100
committerPaul E. McKenney <paulmck@kernel.org>2020-04-13 17:18:12 -0700
commit9967683ce5d4ce21829bbc807e006ee33cc68725 (patch)
tree2875c1204616a1351ca9837c66f41b32c2b92c0f /tools/objtool
parent757a4cefde76697af2b2c284c8a320912b77e7e6 (diff)
downloadlinux-stable-9967683ce5d4ce21829bbc807e006ee33cc68725.tar.gz
linux-stable-9967683ce5d4ce21829bbc807e006ee33cc68725.tar.bz2
linux-stable-9967683ce5d4ce21829bbc807e006ee33cc68725.zip
objtool, kcsan: Add explicit check functions to uaccess whitelist
Add explicitly invoked KCSAN check functions to objtool's uaccess whitelist. This is needed in order to permit calling into kcsan_check_scoped_accesses() from the fast-path, which in turn calls __kcsan_check_access(). __kcsan_check_access() is the generic variant of the already whitelisted specializations __tsan_{read,write}N. Signed-off-by: Marco Elver <elver@google.com> Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Diffstat (limited to 'tools/objtool')
-rw-r--r--tools/objtool/check.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index b6da413bcbd6..b6a573d56f2e 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -468,8 +468,10 @@ static const char *uaccess_safe_builtin[] = {
"__asan_report_store8_noabort",
"__asan_report_store16_noabort",
/* KCSAN */
+ "__kcsan_check_access",
"kcsan_found_watchpoint",
"kcsan_setup_watchpoint",
+ "kcsan_check_scoped_accesses",
/* KCSAN/TSAN */
"__tsan_func_entry",
"__tsan_func_exit",