]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
objtool, kcsan: Add explicit check functions to uaccess whitelist
authorMarco Elver <elver@google.com>
Wed, 25 Mar 2020 16:41:57 +0000 (17:41 +0100)
committerPaul E. McKenney <paulmck@kernel.org>
Tue, 14 Apr 2020 00:18:12 +0000 (17:18 -0700)
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>
tools/objtool/check.c

index b6da413bcbd61642f34c1235309de4b7c41943b0..b6a573d56f2efc2edd422909d2b39bc160bf20f7 100644 (file)
@@ -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",