From: Sami Tolvanen <samitolvanen@google.com> To: Kees Cook <keescook@chromium.org> Cc: Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Masahiro Yamada <masahiroy@kernel.org>, Will Deacon <will@kernel.org>, Jessica Yu <jeyu@kernel.org>, Arnd Bergmann <arnd@arndb.de>, Tejun Heo <tj@kernel.org>, "Paul E. McKenney" <paulmck@kernel.org>, Christoph Hellwig <hch@infradead.org>, Peter Zijlstra <peterz@infradead.org>, Sedat Dilek <sedat.dilek@gmail.com>, Mark Rutland <mark.rutland@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, bpf@vger.kernel.org, linux-hardening@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Sami Tolvanen <samitolvanen@google.com> Subject: [PATCH v6 06/18] kthread: use WARN_ON_FUNCTION_MISMATCH Date: Thu, 8 Apr 2021 11:28:31 -0700 [thread overview] Message-ID: <20210408182843.1754385-7-samitolvanen@google.com> (raw) In-Reply-To: <20210408182843.1754385-1-samitolvanen@google.com> With CONFIG_CFI_CLANG, a callback function passed to __kthread_queue_delayed_work from a module points to a jump table entry defined in the module instead of the one used in the core kernel, which breaks function address equality in this check: WARN_ON_ONCE(timer->function != ktead_delayed_work_timer_fn); Use WARN_ON_FUNCTION_MISMATCH() instead to disable the warning when CFI and modules are both enabled. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Tested-by: Nathan Chancellor <nathan@kernel.org> --- kernel/kthread.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/kthread.c b/kernel/kthread.c index 1578973c5740..a1972eba2917 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -963,7 +963,8 @@ static void __kthread_queue_delayed_work(struct kthread_worker *worker, struct timer_list *timer = &dwork->timer; struct kthread_work *work = &dwork->work; - WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn); + WARN_ON_FUNCTION_MISMATCH(timer->function, + kthread_delayed_work_timer_fn); /* * If @delay is 0, queue @dwork->work immediately. This is for -- 2.31.1.295.g9ea45b61b8-goog
WARNING: multiple messages have this Message-ID (diff)
From: Sami Tolvanen <samitolvanen@google.com> To: Kees Cook <keescook@chromium.org> Cc: Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Masahiro Yamada <masahiroy@kernel.org>, Will Deacon <will@kernel.org>, Jessica Yu <jeyu@kernel.org>, Arnd Bergmann <arnd@arndb.de>, Tejun Heo <tj@kernel.org>, "Paul E. McKenney" <paulmck@kernel.org>, Christoph Hellwig <hch@infradead.org>, Peter Zijlstra <peterz@infradead.org>, Sedat Dilek <sedat.dilek@gmail.com>, Mark Rutland <mark.rutland@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, bpf@vger.kernel.org, linux-hardening@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Sami Tolvanen <samitolvanen@google.com> Subject: [PATCH v6 06/18] kthread: use WARN_ON_FUNCTION_MISMATCH Date: Thu, 8 Apr 2021 11:28:31 -0700 [thread overview] Message-ID: <20210408182843.1754385-7-samitolvanen@google.com> (raw) In-Reply-To: <20210408182843.1754385-1-samitolvanen@google.com> With CONFIG_CFI_CLANG, a callback function passed to __kthread_queue_delayed_work from a module points to a jump table entry defined in the module instead of the one used in the core kernel, which breaks function address equality in this check: WARN_ON_ONCE(timer->function != ktead_delayed_work_timer_fn); Use WARN_ON_FUNCTION_MISMATCH() instead to disable the warning when CFI and modules are both enabled. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Tested-by: Nathan Chancellor <nathan@kernel.org> --- kernel/kthread.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/kthread.c b/kernel/kthread.c index 1578973c5740..a1972eba2917 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -963,7 +963,8 @@ static void __kthread_queue_delayed_work(struct kthread_worker *worker, struct timer_list *timer = &dwork->timer; struct kthread_work *work = &dwork->work; - WARN_ON_ONCE(timer->function != kthread_delayed_work_timer_fn); + WARN_ON_FUNCTION_MISMATCH(timer->function, + kthread_delayed_work_timer_fn); /* * If @delay is 0, queue @dwork->work immediately. This is for -- 2.31.1.295.g9ea45b61b8-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-08 18:29 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-08 18:28 [PATCH v6 00/18] Add support for Clang CFI Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 01/18] add " Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 02/18] cfi: add __cficanonical Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 03/18] mm: add generic function_nocfi macro Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 04/18] module: ensure __cfi_check alignment Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 05/18] workqueue: use WARN_ON_FUNCTION_MISMATCH Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen [this message] 2021-04-08 18:28 ` [PATCH v6 06/18] kthread: " Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 07/18] kallsyms: strip ThinLTO hashes from static functions Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 08/18] bpf: disable CFI in dispatcher functions Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 09/18] treewide: Change list_sort to use const pointers Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 10/18] lkdtm: use function_nocfi Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 11/18] psci: use function_nocfi for cpu_resume Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 12/18] arm64: implement function_nocfi Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 13/18] arm64: use function_nocfi with __pa_symbol Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 14/18] arm64: add __nocfi to functions that jump to a physical address Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 15/18] arm64: add __nocfi to __apply_alternatives Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 16/18] arm64: ftrace: use function_nocfi for ftrace_call Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 17/18] KVM: arm64: Disable CFI for nVHE Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 18:28 ` [PATCH v6 18/18] arm64: allow CONFIG_CFI_CLANG to be selected Sami Tolvanen 2021-04-08 18:28 ` Sami Tolvanen 2021-04-08 22:59 ` [PATCH v6 00/18] Add support for Clang CFI Kees Cook 2021-04-08 22:59 ` Kees Cook
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=20210408182843.1754385-7-samitolvanen@google.com \ --to=samitolvanen@google.com \ --cc=arnd@arndb.de \ --cc=bpf@vger.kernel.org \ --cc=catalin.marinas@arm.com \ --cc=clang-built-linux@googlegroups.com \ --cc=hch@infradead.org \ --cc=jeyu@kernel.org \ --cc=keescook@chromium.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-hardening@vger.kernel.org \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=masahiroy@kernel.org \ --cc=nathan@kernel.org \ --cc=ndesaulniers@google.com \ --cc=paulmck@kernel.org \ --cc=peterz@infradead.org \ --cc=sedat.dilek@gmail.com \ --cc=tj@kernel.org \ --cc=will@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.