From: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
To: mricon@kernel.org
Subject: [PATCH v5 14/21] treewide: Drop WARN_ON_FUNCTION_MISMATCH
Date: Thu, 01 Sep 2022 15:28:59 -0400 [thread overview]
Message-ID: <20220901-kcfi_support-v5-14-be2007d8da63@linuxfoundation.org> (raw)
In-Reply-To: <20220901-kcfi_support-v5-0-be2007d8da63@linuxfoundation.org>
From: Sami Tolvanen <samitolvanen@google.com>
CONFIG_CFI_CLANG no longer breaks cross-module function address
equality, which makes WARN_ON_FUNCTION_MISMATCH unnecessary. Remove
the definition and switch back to WARN_ON_ONCE.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Tested-by: Kees Cook <keescook@chromium.org>
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index ba1f860af38b..4050b191e1a9 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -220,22 +220,6 @@ extern __printf(1, 2) void __warn_printk(const char *fmt, ...);
# define WARN_ON_SMP(x) ({0;})
#endif
-/*
- * WARN_ON_FUNCTION_MISMATCH() warns if a value doesn't match a
- * function address, and can be useful for catching issues with
- * callback functions, for example.
- *
- * With CONFIG_CFI_CLANG, the warning is disabled because the
- * compiler replaces function addresses taken in C code with
- * local jump table addresses, which breaks cross-module function
- * address equality.
- */
-#if defined(CONFIG_CFI_CLANG) && defined(CONFIG_MODULES)
-# define WARN_ON_FUNCTION_MISMATCH(x, fn) ({ 0; })
-#else
-# define WARN_ON_FUNCTION_MISMATCH(x, fn) WARN_ON_ONCE((x) != (fn))
-#endif
-
#endif /* __ASSEMBLY__ */
#endif
diff --git a/kernel/kthread.c b/kernel/kthread.c
index 3c677918d8f2..28a6b7ab4a0f 100644
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@ -1050,8 +1050,7 @@ static void __kthread_queue_delayed_work(struct kthread_worker *worker,
struct timer_list *timer = &dwork->timer;
struct kthread_work *work = &dwork->work;
- WARN_ON_FUNCTION_MISMATCH(timer->function,
- kthread_delayed_work_timer_fn);
+ WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn);
/*
* If @delay is 0, queue @dwork->work immediately. This is for
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index aeea9731ef80..16df315d2a3d 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -1651,7 +1651,7 @@ static void __queue_delayed_work(int cpu, struct workqueue_struct *wq,
struct work_struct *work = &dwork->work;
WARN_ON_ONCE(!wq);
- WARN_ON_FUNCTION_MISMATCH(timer->function, delayed_work_timer_fn);
+ WARN_ON_ONCE(timer->function != delayed_work_timer_fn);
WARN_ON_ONCE(timer_pending(timer));
WARN_ON_ONCE(!list_empty(&work->entry));
--
b4 0.10.0-dev-03aea
next prev parent reply other threads:[~2022-09-01 19:28 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-01 19:28 [PATCH v5 00/21] KCFI support Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 01/21] treewide: Filter out CC_FLAGS_CFI Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 02/21] scripts/kallsyms: Ignore __kcfi_typeid_ Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 03/21] cfi: Remove CONFIG_CFI_CLANG_SHADOW Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 04/21] cfi: Drop __CFI_ADDRESSABLE Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 05/21] cfi: Switch to -fsanitize=kcfi Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 06/21] cfi: Add type helper macros Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 07/21] lkdtm: Emit an indirect call for CFI tests Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 08/21] psci: Fix the function type for psci_initcall_t Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 09/21] arm64: Add types to indirect called assembly functions Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 10/21] arm64: Add CFI error handling Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 11/21] arm64: Drop unneeded __nocfi attributes Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 12/21] init: Drop __nocfi from __init Konstantin Ryabitsev
2022-09-01 19:28 ` [PATCH v5 13/21] treewide: Drop function_nocfi Konstantin Ryabitsev
2022-09-01 19:28 ` Konstantin Ryabitsev [this message]
2022-09-01 19:29 ` [PATCH v5 15/21] treewide: Drop __cficanonical Konstantin Ryabitsev
2022-09-01 19:29 ` [PATCH v5 16/21] objtool: Disable CFI warnings Konstantin Ryabitsev
2022-09-01 19:29 ` [PATCH v5 17/21] kallsyms: Drop CONFIG_CFI_CLANG workarounds Konstantin Ryabitsev
2022-09-01 19:29 ` [PATCH v5 18/21] x86/tools/relocs: Ignore __kcfi_typeid_ relocations Konstantin Ryabitsev
2022-09-01 19:29 ` [PATCH v5 19/21] x86: Add types to indirectly called assembly functions Konstantin Ryabitsev
2022-09-01 19:29 ` [PATCH v5 20/21] x86/purgatory: Disable CFI Konstantin Ryabitsev
2022-09-01 19:29 ` [PATCH v5 21/21] x86: Add support for CONFIG_CFI_CLANG Konstantin Ryabitsev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220901-kcfi_support-v5-14-be2007d8da63@linuxfoundation.org \
--to=konstantin@linuxfoundation.org \
--cc=mricon@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).