From: Sami Tolvanen <samitolvanen@google.com>
To: linux-kernel@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
x86@kernel.org, Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Joao Moreira <joao@overdrivepizza.com>,
Sedat Dilek <sedat.dilek@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
linux-hardening@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev,
Sami Tolvanen <samitolvanen@google.com>
Subject: [RFC PATCH v2 14/21] treewide: Drop __cficanonical
Date: Fri, 13 May 2022 13:21:52 -0700 [thread overview]
Message-ID: <20220513202159.1550547-15-samitolvanen@google.com> (raw)
In-Reply-To: <20220513202159.1550547-1-samitolvanen@google.com>
CONFIG_CFI_CLANG doesn't use a jump table anymore and therefore,
won't change function references to point elsewhere. Remove the
__cficanonical attribute and all uses of it.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
---
include/linux/compiler_types.h | 4 ----
include/linux/init.h | 4 ++--
include/linux/pci.h | 4 ++--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 1c2c33ae1b37..bdd2526af46a 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -263,10 +263,6 @@ struct ftrace_likely_data {
# define __nocfi
#endif
-#ifndef __cficanonical
-# define __cficanonical
-#endif
-
/*
* Any place that could be marked with the "alloc_size" attribute is also
* a place to be marked with the "malloc" attribute. Do this as part of the
diff --git a/include/linux/init.h b/include/linux/init.h
index baf0b29a7010..76058c9e0399 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -220,8 +220,8 @@ extern bool initcall_debug;
__initcall_name(initstub, __iid, id)
#define __define_initcall_stub(__stub, fn) \
- int __init __cficanonical __stub(void); \
- int __init __cficanonical __stub(void) \
+ int __init __stub(void); \
+ int __init __stub(void) \
{ \
return fn(); \
} \
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 60adf42460ab..3cc50c4e3c64 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -2021,8 +2021,8 @@ enum pci_fixup_pass {
#ifdef CONFIG_LTO_CLANG
#define __DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \
class_shift, hook, stub) \
- void __cficanonical stub(struct pci_dev *dev); \
- void __cficanonical stub(struct pci_dev *dev) \
+ void stub(struct pci_dev *dev); \
+ void stub(struct pci_dev *dev) \
{ \
hook(dev); \
} \
--
2.36.0.550.gb090851708-goog
WARNING: multiple messages have this Message-ID (diff)
From: Sami Tolvanen <samitolvanen@google.com>
To: linux-kernel@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
x86@kernel.org, Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Joao Moreira <joao@overdrivepizza.com>,
Sedat Dilek <sedat.dilek@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
linux-hardening@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, llvm@lists.linux.dev,
Sami Tolvanen <samitolvanen@google.com>
Subject: [RFC PATCH v2 14/21] treewide: Drop __cficanonical
Date: Fri, 13 May 2022 13:21:52 -0700 [thread overview]
Message-ID: <20220513202159.1550547-15-samitolvanen@google.com> (raw)
In-Reply-To: <20220513202159.1550547-1-samitolvanen@google.com>
CONFIG_CFI_CLANG doesn't use a jump table anymore and therefore,
won't change function references to point elsewhere. Remove the
__cficanonical attribute and all uses of it.
Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
---
include/linux/compiler_types.h | 4 ----
include/linux/init.h | 4 ++--
include/linux/pci.h | 4 ++--
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index 1c2c33ae1b37..bdd2526af46a 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -263,10 +263,6 @@ struct ftrace_likely_data {
# define __nocfi
#endif
-#ifndef __cficanonical
-# define __cficanonical
-#endif
-
/*
* Any place that could be marked with the "alloc_size" attribute is also
* a place to be marked with the "malloc" attribute. Do this as part of the
diff --git a/include/linux/init.h b/include/linux/init.h
index baf0b29a7010..76058c9e0399 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -220,8 +220,8 @@ extern bool initcall_debug;
__initcall_name(initstub, __iid, id)
#define __define_initcall_stub(__stub, fn) \
- int __init __cficanonical __stub(void); \
- int __init __cficanonical __stub(void) \
+ int __init __stub(void); \
+ int __init __stub(void) \
{ \
return fn(); \
} \
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 60adf42460ab..3cc50c4e3c64 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -2021,8 +2021,8 @@ enum pci_fixup_pass {
#ifdef CONFIG_LTO_CLANG
#define __DECLARE_PCI_FIXUP_SECTION(sec, name, vendor, device, class, \
class_shift, hook, stub) \
- void __cficanonical stub(struct pci_dev *dev); \
- void __cficanonical stub(struct pci_dev *dev) \
+ void stub(struct pci_dev *dev); \
+ void stub(struct pci_dev *dev) \
{ \
hook(dev); \
} \
--
2.36.0.550.gb090851708-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:[~2022-05-13 20:22 UTC|newest]
Thread overview: 174+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-13 20:21 [RFC PATCH v2 00/21] KCFI support Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-13 20:21 ` [RFC PATCH v2 01/21] efi/libstub: Filter out CC_FLAGS_CFI Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:42 ` Kees Cook
2022-05-14 21:42 ` Kees Cook
2022-05-16 15:44 ` Sami Tolvanen
2022-05-16 15:44 ` Sami Tolvanen
2022-05-13 20:21 ` [RFC PATCH v2 02/21] arm64/vdso: " Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:42 ` Kees Cook
2022-05-14 21:42 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 03/21] kallsyms: Ignore __kcfi_typeid_ Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:43 ` Kees Cook
2022-05-14 21:43 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 04/21] cfi: Remove CONFIG_CFI_CLANG_SHADOW Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:43 ` Kees Cook
2022-05-14 21:43 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 05/21] cfi: Drop __CFI_ADDRESSABLE Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:44 ` Kees Cook
2022-05-14 21:44 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 06/21] cfi: Switch to -fsanitize=kcfi Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:46 ` Kees Cook
2022-05-14 21:46 ` Kees Cook
2022-05-15 3:41 ` Kees Cook
2022-05-15 3:41 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 07/21] cfi: Add type helper macros Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:49 ` Kees Cook
2022-05-14 21:49 ` Kees Cook
2022-05-16 12:28 ` Rasmus Villemoes
2022-05-16 12:28 ` Rasmus Villemoes
2022-05-16 16:23 ` Sami Tolvanen
2022-05-16 16:23 ` Sami Tolvanen
2022-05-16 16:04 ` Sami Tolvanen
2022-05-16 16:04 ` Sami Tolvanen
2022-05-13 20:21 ` [RFC PATCH v2 08/21] psci: Fix the function type for psci_initcall_t Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:50 ` Kees Cook
2022-05-14 21:50 ` Kees Cook
2022-05-16 15:44 ` Sami Tolvanen
2022-05-16 15:44 ` Sami Tolvanen
2022-05-17 8:47 ` Mark Rutland
2022-05-17 8:47 ` Mark Rutland
2022-05-13 20:21 ` [RFC PATCH v2 09/21] arm64: Add types to indirect called assembly functions Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:50 ` Kees Cook
2022-05-14 21:50 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 10/21] arm64: Add CFI error handling Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:51 ` Kees Cook
2022-05-14 21:51 ` Kees Cook
2022-05-16 16:24 ` Sami Tolvanen
2022-05-16 16:24 ` Sami Tolvanen
2022-05-13 20:21 ` [RFC PATCH v2 11/21] arm64: Drop unneeded __nocfi attributes Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:54 ` Kees Cook
2022-05-14 21:54 ` Kees Cook
2022-05-16 16:28 ` Sami Tolvanen
2022-05-16 16:28 ` Sami Tolvanen
2022-05-13 20:21 ` [RFC PATCH v2 12/21] treewide: Drop function_nocfi Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:54 ` Kees Cook
2022-05-14 21:54 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 13/21] treewide: Drop WARN_ON_FUNCTION_MISMATCH Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:54 ` Kees Cook
2022-05-14 21:54 ` Kees Cook
2022-05-13 20:21 ` Sami Tolvanen [this message]
2022-05-13 20:21 ` [RFC PATCH v2 14/21] treewide: Drop __cficanonical Sami Tolvanen
2022-05-14 21:56 ` Kees Cook
2022-05-14 21:56 ` Kees Cook
2022-05-16 16:32 ` Sami Tolvanen
2022-05-16 16:32 ` Sami Tolvanen
2022-05-13 20:21 ` [RFC PATCH v2 15/21] objtool: Don't warn about __cfi_ preambles falling through Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:56 ` Kees Cook
2022-05-14 21:56 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 16/21] x86/tools/relocs: Ignore __kcfi_typeid_ relocations Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:57 ` Kees Cook
2022-05-14 21:57 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 17/21] x86: Add types to indirectly called assembly functions Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:58 ` Kees Cook
2022-05-14 21:58 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 18/21] x86/purgatory: Disable CFI Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:58 ` Kees Cook
2022-05-14 21:58 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 19/21] x86/vdso: " Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 21:58 ` Kees Cook
2022-05-14 21:58 ` Kees Cook
2022-05-13 20:21 ` [RFC PATCH v2 20/21] x86: Add support for CONFIG_CFI_CLANG Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 22:02 ` Kees Cook
2022-05-14 22:02 ` Kees Cook
2022-05-16 18:57 ` Sami Tolvanen
2022-05-16 18:57 ` Sami Tolvanen
2022-05-15 3:19 ` Kees Cook
2022-05-15 3:19 ` Kees Cook
2022-05-16 8:32 ` David Laight
2022-05-16 8:32 ` David Laight
2022-05-16 16:39 ` Sami Tolvanen
2022-05-16 16:39 ` Sami Tolvanen
2022-05-16 21:32 ` David Laight
2022-05-16 21:32 ` David Laight
2022-05-16 21:44 ` Peter Zijlstra
2022-05-16 21:44 ` Peter Zijlstra
2022-05-16 22:03 ` Sami Tolvanen
2022-05-16 22:03 ` Sami Tolvanen
2022-05-17 6:44 ` Peter Zijlstra
2022-05-17 6:44 ` Peter Zijlstra
2022-05-17 20:36 ` Sami Tolvanen
2022-05-17 20:36 ` Sami Tolvanen
2022-05-17 7:56 ` David Laight
2022-05-17 7:56 ` David Laight
2022-05-16 9:54 ` Peter Zijlstra
2022-05-16 9:54 ` Peter Zijlstra
2022-05-16 11:45 ` Peter Zijlstra
2022-05-16 11:45 ` Peter Zijlstra
2022-05-16 12:58 ` Peter Zijlstra
2022-05-16 12:58 ` Peter Zijlstra
2022-05-20 13:49 ` Matthew Wilcox
2022-05-20 13:49 ` Matthew Wilcox
2022-05-16 17:15 ` Sami Tolvanen
2022-05-16 17:15 ` Sami Tolvanen
2022-05-16 18:30 ` Peter Zijlstra
2022-05-16 18:30 ` Peter Zijlstra
2022-05-16 19:39 ` Sami Tolvanen
2022-05-16 19:39 ` Sami Tolvanen
2022-05-16 20:37 ` Peter Zijlstra
2022-05-16 20:37 ` Peter Zijlstra
2022-05-25 20:02 ` Kees Cook
2022-05-25 20:02 ` Kees Cook
2022-05-16 22:59 ` Kees Cook
2022-05-16 22:59 ` Kees Cook
2022-05-17 8:05 ` Peter Zijlstra
2022-05-17 8:05 ` Peter Zijlstra
2022-05-17 8:32 ` Joao Moreira
2022-05-17 8:32 ` Joao Moreira
2022-05-17 8:40 ` Peter Zijlstra
2022-05-17 8:40 ` Peter Zijlstra
2022-05-17 8:48 ` David Laight
2022-05-17 8:48 ` David Laight
2022-05-17 9:38 ` Peter Zijlstra
2022-05-17 9:38 ` Peter Zijlstra
2022-05-13 20:21 ` [RFC PATCH v2 21/21] init: Drop __nocfi from __init Sami Tolvanen
2022-05-13 20:21 ` Sami Tolvanen
2022-05-14 22:03 ` Kees Cook
2022-05-14 22:03 ` Kees Cook
2022-05-16 17:16 ` Sami Tolvanen
2022-05-16 17:16 ` Sami Tolvanen
[not found] ` <CA+icZUWr+-HjMvY1VZf+nqjTadxSTDciux0Y5Y-+p_j4o7CmXg@mail.gmail.com>
2022-05-16 17:57 ` [RFC PATCH v2 00/21] KCFI support Sami Tolvanen
2022-05-16 17:57 ` Sami Tolvanen
2022-05-17 7:33 ` Sedat Dilek
2022-05-17 7:33 ` Sedat Dilek
2022-05-17 18:49 ` Nathan Chancellor
2022-05-17 18:49 ` Nathan Chancellor
2022-05-19 9:01 ` Sedat Dilek
2022-05-19 9:01 ` Sedat Dilek
2022-05-19 20:26 ` Nathan Chancellor
2022-05-19 20:26 ` Nathan Chancellor
2022-05-19 20:41 ` Sami Tolvanen
2022-05-19 20:41 ` Sami Tolvanen
2022-05-17 8:57 ` Peter Zijlstra
2022-05-17 8:57 ` Peter Zijlstra
2022-05-17 20:25 ` Sami Tolvanen
2022-05-17 20:25 ` 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=20220513202159.1550547-15-samitolvanen@google.com \
--to=samitolvanen@google.com \
--cc=catalin.marinas@arm.com \
--cc=joao@overdrivepizza.com \
--cc=jpoimboe@redhat.com \
--cc=keescook@chromium.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=mark.rutland@arm.com \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=sedat.dilek@gmail.com \
--cc=will@kernel.org \
--cc=x86@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 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.