linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	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 v4 16/17] KVM: arm64: Disable CFI for nVHE
Date: Wed, 31 Mar 2021 14:27:20 -0700	[thread overview]
Message-ID: <20210331212722.2746212-17-samitolvanen@google.com> (raw)
In-Reply-To: <20210331212722.2746212-1-samitolvanen@google.com>

Disable CFI for the nVHE code to avoid address space confusion.

Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
---
 arch/arm64/kvm/hyp/nvhe/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
index a6707df4f6c0..fb24a0f022ad 100644
--- a/arch/arm64/kvm/hyp/nvhe/Makefile
+++ b/arch/arm64/kvm/hyp/nvhe/Makefile
@@ -75,9 +75,9 @@ quiet_cmd_hyprel = HYPREL  $@
 quiet_cmd_hypcopy = HYPCOPY $@
       cmd_hypcopy = $(OBJCOPY) --prefix-symbols=__kvm_nvhe_ $< $@
 
-# Remove ftrace and Shadow Call Stack CFLAGS.
-# This is equivalent to the 'notrace' and '__noscs' annotations.
-KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_FTRACE) $(CC_FLAGS_SCS), $(KBUILD_CFLAGS))
+# Remove ftrace, Shadow Call Stack, and CFI CFLAGS.
+# This is equivalent to the 'notrace', '__noscs', and '__nocfi' annotations.
+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_FTRACE) $(CC_FLAGS_SCS) $(CC_FLAGS_CFI), $(KBUILD_CFLAGS))
 
 # KVM nVHE code is run at a different exception code with a different map, so
 # compiler instrumentation that inserts callbacks or checks into the code may
-- 
2.31.0.291.g576ba9dcdaf-goog


  parent reply	other threads:[~2021-03-31 21:28 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-31 21:27 [PATCH v4 00/17] Add support for Clang CFI Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 01/17] add " Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 02/17] cfi: add __cficanonical Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 03/17] mm: add generic function_nocfi macro Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 04/17] module: ensure __cfi_check alignment Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 05/17] workqueue: use WARN_ON_FUNCTION_MISMATCH Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 06/17] kthread: " Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 07/17] kallsyms: strip ThinLTO hashes from static functions Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 08/17] bpf: disable CFI in dispatcher functions Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 09/17] treewide: Change list_sort to use const pointers Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 10/17] lkdtm: use function_nocfi Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 11/17] psci: use function_nocfi for cpu_resume Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 12/17] arm64: implement function_nocfi Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 13/17] arm64: use function_nocfi with __pa_symbol Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 14/17] arm64: add __nocfi to functions that jump to a physical address Sami Tolvanen
2021-03-31 21:27 ` [PATCH v4 15/17] arm64: add __nocfi to __apply_alternatives Sami Tolvanen
2021-03-31 21:27 ` Sami Tolvanen [this message]
2021-03-31 21:27 ` [PATCH v4 17/17] arm64: allow CONFIG_CFI_CLANG to be selected Sami Tolvanen
2021-03-31 21:46 ` [PATCH v4 00/17] Add support for Clang CFI 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=20210331212722.2746212-17-samitolvanen@google.com \
    --to=samitolvanen@google.com \
    --cc=arnd@arndb.de \
    --cc=bpf@vger.kernel.org \
    --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=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: 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).