Drop cfi-add-cfi_noseal.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.1/cfi-add-cfi_noseal.patch b/queue-6.1/cfi-add-cfi_noseal.patch
deleted file mode 100644 (file)
index ec91e1c..0000000
--- a/queue-6.1/cfi-add-cfi_noseal.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From bfe2ec28ec2b6bdd08895cac43c9ec27104096ed Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 15 Dec 2023 10:12:21 +0100
-Subject: cfi: Add CFI_NOSEAL()
-
-From: Peter Zijlstra <peterz@infradead.org>
-
-[ Upstream commit e9d13b9d2f99ccf7afeab490d97eaa5ac9846598 ]
-
-Add a CFI_NOSEAL() helper to mark functions that need to retain their
-CFI information, despite not otherwise leaking their address.
-
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Link: https://lore.kernel.org/r/20231215092707.669401084@infradead.org
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/include/asm/cfi.h | 5 +++++
- include/linux/cfi.h        | 4 ++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/arch/x86/include/asm/cfi.h b/arch/x86/include/asm/cfi.h
-index 58dacd90daef..67b010c224e4 100644
---- a/arch/x86/include/asm/cfi.h
-+++ b/arch/x86/include/asm/cfi.h
-@@ -9,6 +9,7 @@
-  */
- 
- #include <linux/cfi.h>
-+#include <asm/ibt.h>
- 
- #ifdef CONFIG_CFI_CLANG
- enum bug_trap_type handle_cfi_failure(struct pt_regs *regs);
-@@ -19,4 +20,8 @@ static inline enum bug_trap_type handle_cfi_failure(struct pt_regs *regs)
- }
- #endif /* CONFIG_CFI_CLANG */
- 
-+#if HAS_KERNEL_IBT == 1
-+#define CFI_NOSEAL(x) asm(IBT_NOSEAL(__stringify(x)))
-+#endif
-+
- #endif /* _ASM_X86_CFI_H */
-diff --git a/include/linux/cfi.h b/include/linux/cfi.h
-index 5e134f4ce8b7..f2f722c5aedd 100644
---- a/include/linux/cfi.h
-+++ b/include/linux/cfi.h
-@@ -36,4 +36,8 @@ static inline void module_cfi_finalize(const Elf_Ehdr *hdr,
- #endif /* CONFIG_ARCH_USES_CFI_TRAPS */
- #endif /* CONFIG_MODULES */
- 
-+#ifndef CFI_NOSEAL
-+#define CFI_NOSEAL(x)
-+#endif
-+
- #endif /* _LINUX_CFI_H */
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 7d8b4e86fe1a9b7dd8778655d4fda9e59f27b281..197f0506e37469465cd2a55274a2663f6256abf8 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -86,7 +86,6 @@ net-atlantic-eliminate-double-free-in-error-handling.patch
 net-dsa-mv88e6xxx-fix-mv88e6352_serdes_get_stats-err.patch
 block-prevent-an-integer-overflow-in-bvec_try_merge_.patch
 md-whenassemble-the-array-consult-the-superblock-of-.patch
-cfi-add-cfi_noseal.patch
 arm64-dts-qcom-msm8996-fix-in-ports-is-a-required-pr.patch
 arm64-dts-qcom-msm8998-fix-out-ports-is-a-required-p.patch
 ice-fix-pre-shifted-bit-usage.patch

diff --git a/queue-6.6/cfi-add-cfi_noseal.patch b/queue-6.6/cfi-add-cfi_noseal.patch
deleted file mode 100644 (file)
index 41c3841..0000000
--- a/queue-6.6/cfi-add-cfi_noseal.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 53e565d7b79930b416aa4725c1f492957a993a3b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 15 Dec 2023 10:12:21 +0100
-Subject: cfi: Add CFI_NOSEAL()
-
-From: Peter Zijlstra <peterz@infradead.org>
-
-[ Upstream commit e9d13b9d2f99ccf7afeab490d97eaa5ac9846598 ]
-
-Add a CFI_NOSEAL() helper to mark functions that need to retain their
-CFI information, despite not otherwise leaking their address.
-
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Link: https://lore.kernel.org/r/20231215092707.669401084@infradead.org
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/include/asm/cfi.h | 5 +++++
- include/linux/cfi.h        | 4 ++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/arch/x86/include/asm/cfi.h b/arch/x86/include/asm/cfi.h
-index 58dacd90daef..67b010c224e4 100644
---- a/arch/x86/include/asm/cfi.h
-+++ b/arch/x86/include/asm/cfi.h
-@@ -9,6 +9,7 @@
-  */
- 
- #include <linux/cfi.h>
-+#include <asm/ibt.h>
- 
- #ifdef CONFIG_CFI_CLANG
- enum bug_trap_type handle_cfi_failure(struct pt_regs *regs);
-@@ -19,4 +20,8 @@ static inline enum bug_trap_type handle_cfi_failure(struct pt_regs *regs)
- }
- #endif /* CONFIG_CFI_CLANG */
- 
-+#if HAS_KERNEL_IBT == 1
-+#define CFI_NOSEAL(x) asm(IBT_NOSEAL(__stringify(x)))
-+#endif
-+
- #endif /* _ASM_X86_CFI_H */
-diff --git a/include/linux/cfi.h b/include/linux/cfi.h
-index 3552ec82b725..bb084eb053e7 100644
---- a/include/linux/cfi.h
-+++ b/include/linux/cfi.h
-@@ -38,4 +38,8 @@ static inline void module_cfi_finalize(const Elf_Ehdr *hdr,
- #endif /* CONFIG_ARCH_USES_CFI_TRAPS */
- #endif /* CONFIG_MODULES */
- 
-+#ifndef CFI_NOSEAL
-+#define CFI_NOSEAL(x)
-+#endif
-+
- #endif /* _LINUX_CFI_H */
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 8c0d7ad2cfb01543bc0a3cdb96ccf6aa9f644cde..06d40215e4f4e37751b38002b3c152a3de4a126d 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -131,7 +131,6 @@ arm-dts-marvell-fix-some-common-switch-mistakes.patch
 arm64-dts-marvell-fix-some-common-switch-mistakes.patch
 block-prevent-an-integer-overflow-in-bvec_try_merge_.patch
 md-whenassemble-the-array-consult-the-superblock-of-.patch
-cfi-add-cfi_noseal.patch
 arm64-dts-qcom-msm8996-fix-in-ports-is-a-required-pr.patch
 arm64-dts-qcom-msm8998-fix-out-ports-is-a-required-p.patch
 arm64-dts-qcom-fix-coresight-warnings-in-in-ports-an.patch

diff --git a/queue-6.7/cfi-add-cfi_noseal.patch b/queue-6.7/cfi-add-cfi_noseal.patch
deleted file mode 100644 (file)
index 66532fd..0000000
--- a/queue-6.7/cfi-add-cfi_noseal.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From e4eb6eb5961854b97c91de0966a932468e82fdfc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 15 Dec 2023 10:12:21 +0100
-Subject: cfi: Add CFI_NOSEAL()
-
-From: Peter Zijlstra <peterz@infradead.org>
-
-[ Upstream commit e9d13b9d2f99ccf7afeab490d97eaa5ac9846598 ]
-
-Add a CFI_NOSEAL() helper to mark functions that need to retain their
-CFI information, despite not otherwise leaking their address.
-
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Link: https://lore.kernel.org/r/20231215092707.669401084@infradead.org
-Signed-off-by: Alexei Starovoitov <ast@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/x86/include/asm/cfi.h | 5 +++++
- include/linux/cfi.h        | 4 ++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/arch/x86/include/asm/cfi.h b/arch/x86/include/asm/cfi.h
-index 58dacd90daef..67b010c224e4 100644
---- a/arch/x86/include/asm/cfi.h
-+++ b/arch/x86/include/asm/cfi.h
-@@ -9,6 +9,7 @@
-  */
- 
- #include <linux/cfi.h>
-+#include <asm/ibt.h>
- 
- #ifdef CONFIG_CFI_CLANG
- enum bug_trap_type handle_cfi_failure(struct pt_regs *regs);
-@@ -19,4 +20,8 @@ static inline enum bug_trap_type handle_cfi_failure(struct pt_regs *regs)
- }
- #endif /* CONFIG_CFI_CLANG */
- 
-+#if HAS_KERNEL_IBT == 1
-+#define CFI_NOSEAL(x) asm(IBT_NOSEAL(__stringify(x)))
-+#endif
-+
- #endif /* _ASM_X86_CFI_H */
-diff --git a/include/linux/cfi.h b/include/linux/cfi.h
-index 3552ec82b725..bb084eb053e7 100644
---- a/include/linux/cfi.h
-+++ b/include/linux/cfi.h
-@@ -38,4 +38,8 @@ static inline void module_cfi_finalize(const Elf_Ehdr *hdr,
- #endif /* CONFIG_ARCH_USES_CFI_TRAPS */
- #endif /* CONFIG_MODULES */
- 
-+#ifndef CFI_NOSEAL
-+#define CFI_NOSEAL(x)
-+#endif
-+
- #endif /* _LINUX_CFI_H */
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index ccdef8fefd50fbf52eabeffc5772dcb7579670ab..bdf30cd12621357b481b4912056fc5b40bd95cba 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -137,7 +137,6 @@ arm-dts-marvell-fix-some-common-switch-mistakes.patch
 arm64-dts-marvell-fix-some-common-switch-mistakes.patch
 block-prevent-an-integer-overflow-in-bvec_try_merge_.patch
 md-whenassemble-the-array-consult-the-superblock-of-.patch
-cfi-add-cfi_noseal.patch
 x86-cfi-bpf-fix-bpf_exception_cb-signature.patch
 arm64-dts-qcom-msm8996-fix-in-ports-is-a-required-pr.patch
 arm64-dts-qcom-msm8998-fix-out-ports-is-a-required-p.patch