From: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
To: mricon@kernel.org
Subject: [PATCH v5 09/21] arm64: Add types to indirect called assembly functions
Date: Thu, 01 Sep 2022 15:28:54 -0400 [thread overview]
Message-ID: <20220901-kcfi_support-v5-9-be2007d8da63@linuxfoundation.org> (raw)
In-Reply-To: <20220901-kcfi_support-v5-0-be2007d8da63@linuxfoundation.org>
From: Sami Tolvanen <samitolvanen@google.com>
With CONFIG_CFI_CLANG, assembly functions indirectly called from C
code must be annotated with type identifiers to pass CFI checking. Use
SYM_TYPED_FUNC_START for the indirectly called functions.
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/arch/arm64/crypto/ghash-ce-core.S b/arch/arm64/crypto/ghash-ce-core.S
index 7868330dd54e..ebe5558929b7 100644
--- a/arch/arm64/crypto/ghash-ce-core.S
+++ b/arch/arm64/crypto/ghash-ce-core.S
@@ -6,6 +6,7 @@
*/
#include <linux/linkage.h>
+#include <linux/cfi_types.h>
#include <asm/assembler.h>
SHASH .req v0
@@ -350,11 +351,11 @@ CPU_LE( rev64 T1.16b, T1.16b )
* void pmull_ghash_update(int blocks, u64 dg[], const char *src,
* struct ghash_key const *k, const char *head)
*/
-SYM_FUNC_START(pmull_ghash_update_p64)
+SYM_TYPED_FUNC_START(pmull_ghash_update_p64)
__pmull_ghash p64
SYM_FUNC_END(pmull_ghash_update_p64)
-SYM_FUNC_START(pmull_ghash_update_p8)
+SYM_TYPED_FUNC_START(pmull_ghash_update_p8)
__pmull_ghash p8
SYM_FUNC_END(pmull_ghash_update_p8)
diff --git a/arch/arm64/crypto/sm3-ce-core.S b/arch/arm64/crypto/sm3-ce-core.S
index ef97d3187cb7..ca70cfacd0d0 100644
--- a/arch/arm64/crypto/sm3-ce-core.S
+++ b/arch/arm64/crypto/sm3-ce-core.S
@@ -6,6 +6,7 @@
*/
#include <linux/linkage.h>
+#include <linux/cfi_types.h>
#include <asm/assembler.h>
.irp b, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
@@ -73,7 +74,7 @@
* int blocks)
*/
.text
-SYM_FUNC_START(sm3_ce_transform)
+SYM_TYPED_FUNC_START(sm3_ce_transform)
/* load state */
ld1 {v8.4s-v9.4s}, [x0]
rev64 v8.4s, v8.4s
diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S
index 48a8af97faa9..6b752fe89745 100644
--- a/arch/arm64/kernel/cpu-reset.S
+++ b/arch/arm64/kernel/cpu-reset.S
@@ -8,6 +8,7 @@
*/
#include <linux/linkage.h>
+#include <linux/cfi_types.h>
#include <asm/assembler.h>
#include <asm/sysreg.h>
#include <asm/virt.h>
@@ -28,7 +29,7 @@
* branch to what would be the reset vector. It must be executed with the
* flat identity mapping.
*/
-SYM_CODE_START(cpu_soft_restart)
+SYM_TYPED_FUNC_START(cpu_soft_restart)
mov_q x12, INIT_SCTLR_EL1_MMU_OFF
pre_disable_mmu_workaround
/*
@@ -47,6 +48,6 @@ SYM_CODE_START(cpu_soft_restart)
mov x1, x3 // arg1
mov x2, x4 // arg2
br x8
-SYM_CODE_END(cpu_soft_restart)
+SYM_FUNC_END(cpu_soft_restart)
.popsection
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index 7837a69524c5..8b9f419fcad9 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -10,6 +10,7 @@
#include <linux/init.h>
#include <linux/linkage.h>
#include <linux/pgtable.h>
+#include <linux/cfi_types.h>
#include <asm/assembler.h>
#include <asm/asm-offsets.h>
#include <asm/asm_pointer_auth.h>
@@ -185,7 +186,7 @@ SYM_FUNC_END(cpu_do_resume)
* This is the low-level counterpart to cpu_replace_ttbr1, and should not be
* called by anything else. It can only be executed from a TTBR0 mapping.
*/
-SYM_FUNC_START(idmap_cpu_replace_ttbr1)
+SYM_TYPED_FUNC_START(idmap_cpu_replace_ttbr1)
save_and_disable_daif flags=x2
__idmap_cpu_set_reserved_ttbr1 x1, x3
@@ -253,7 +254,7 @@ SYM_FUNC_END(idmap_cpu_replace_ttbr1)
SYM_DATA(__idmap_kpti_flag, .long 1)
.popsection
-SYM_FUNC_START(idmap_kpti_install_ng_mappings)
+SYM_TYPED_FUNC_START(idmap_kpti_install_ng_mappings)
cpu .req w0
temp_pte .req x0
num_cpus .req w1
--
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 ` Konstantin Ryabitsev [this message]
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 ` [PATCH v5 14/21] treewide: Drop WARN_ON_FUNCTION_MISMATCH Konstantin Ryabitsev
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-9-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).