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>,
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,
Sami Tolvanen <samitolvanen@google.com>
Subject: [PATCH v2 08/17] bpf: disable CFI in dispatcher functions
Date: Thu, 18 Mar 2021 10:11:02 -0700 [thread overview]
Message-ID: <20210318171111.706303-9-samitolvanen@google.com> (raw)
In-Reply-To: <20210318171111.706303-1-samitolvanen@google.com>
BPF dispatcher functions are patched at runtime to perform direct
instead of indirect calls. Disable CFI for the dispatcher functions to
avoid conflicts.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
---
include/linux/bpf.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index cccaef1088ea..9acdca574527 100644
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -635,7 +635,7 @@ struct bpf_dispatcher {
struct bpf_ksym ksym;
};
-static __always_inline unsigned int bpf_dispatcher_nop_func(
+static __always_inline __nocfi unsigned int bpf_dispatcher_nop_func(
const void *ctx,
const struct bpf_insn *insnsi,
unsigned int (*bpf_func)(const void *,
@@ -663,7 +663,7 @@ void bpf_trampoline_put(struct bpf_trampoline *tr);
}
#define DEFINE_BPF_DISPATCHER(name) \
- noinline unsigned int bpf_dispatcher_##name##_func( \
+ noinline __nocfi unsigned int bpf_dispatcher_##name##_func( \
const void *ctx, \
const struct bpf_insn *insnsi, \
unsigned int (*bpf_func)(const void *, \
--
2.31.0.291.g576ba9dcdaf-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-03-18 17:14 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 17:10 [PATCH v2 00/17] Add support for Clang CFI Sami Tolvanen
2021-03-18 17:10 ` [PATCH v2 01/17] add " Sami Tolvanen
2021-03-18 22:29 ` Peter Zijlstra
2021-03-18 23:48 ` Sami Tolvanen
2021-03-19 12:26 ` Peter Zijlstra
2021-03-19 13:52 ` Paul E. McKenney
2021-03-19 16:17 ` Sami Tolvanen
2021-03-19 17:03 ` Paul E. McKenney
2021-03-18 17:10 ` [PATCH v2 02/17] cfi: add __cficanonical Sami Tolvanen
2021-03-18 17:49 ` Nick Desaulniers
2021-03-18 17:10 ` [PATCH v2 03/17] mm: add generic __va_function and __pa_function macros Sami Tolvanen
2021-03-18 17:10 ` [PATCH v2 04/17] module: ensure __cfi_check alignment Sami Tolvanen
2021-03-18 19:27 ` Nick Desaulniers
2021-03-18 21:43 ` Sami Tolvanen
2021-03-18 17:10 ` [PATCH v2 05/17] workqueue: use WARN_ON_FUNCTION_MISMATCH Sami Tolvanen
2021-03-18 18:50 ` Nick Desaulniers
2021-03-18 21:38 ` Sami Tolvanen
2021-03-18 17:11 ` [PATCH v2 06/17] kthread: " Sami Tolvanen
2021-03-18 17:11 ` [PATCH v2 07/17] kallsyms: strip ThinLTO hashes from static functions Sami Tolvanen
2021-03-18 19:00 ` Nick Desaulniers
2021-03-18 21:41 ` Sami Tolvanen
2021-03-18 17:11 ` Sami Tolvanen [this message]
2021-03-18 17:11 ` [PATCH v2 09/17] lib/list_sort: fix function type mismatches Sami Tolvanen
2021-03-18 18:31 ` Nick Desaulniers
2021-03-18 21:31 ` Sami Tolvanen
2021-03-18 17:11 ` [PATCH v2 10/17] lkdtm: use __va_function Sami Tolvanen
2021-03-18 18:43 ` Nick Desaulniers
2021-03-18 18:45 ` Nick Desaulniers
2021-03-18 17:11 ` [PATCH v2 11/17] psci: use __pa_function for cpu_resume Sami Tolvanen
2021-03-18 17:11 ` [PATCH v2 12/17] arm64: implement __va_function Sami Tolvanen
2021-03-18 17:11 ` [PATCH v2 13/17] arm64: use __pa_function Sami Tolvanen
2021-03-18 17:11 ` [PATCH v2 14/17] arm64: add __nocfi to functions that jump to a physical address Sami Tolvanen
2021-03-18 17:11 ` [PATCH v2 15/17] arm64: add __nocfi to __apply_alternatives Sami Tolvanen
2021-03-18 17:11 ` [PATCH v2 16/17] KVM: arm64: Disable CFI for nVHE Sami Tolvanen
2021-03-18 17:11 ` [PATCH v2 17/17] arm64: allow CONFIG_CFI_CLANG to be selected Sami Tolvanen
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=20210318171111.706303-9-samitolvanen@google.com \
--to=samitolvanen@google.com \
--cc=arnd@arndb.de \
--cc=bpf@vger.kernel.org \
--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=masahiroy@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=paulmck@kernel.org \
--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: 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 NNTP newsgroup(s).