summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pagano <mpagano@gentoo.org>2024-04-21 18:24:38 -0400
committerMike Pagano <mpagano@gentoo.org>2024-04-21 18:24:38 -0400
commit3584cee31ed8f353980cc8b10137fc86a44d0669 (patch)
tree18f1a487c62adbbade6db2b6fd7dff1c11e7d5e6
parentLinux patch 6.8.7 (diff)
downloadlinux-patches-3584cee31ed8f353980cc8b10137fc86a44d0669.tar.gz
linux-patches-3584cee31ed8f353980cc8b10137fc86a44d0669.tar.bz2
linux-patches-3584cee31ed8f353980cc8b10137fc86a44d0669.zip
Remove redundant patch
Removed: 1800_gcc-plugins-stackleak-Avoid-head-text-section.patch Bug: https://bugs.gentoo.org/930389 Signed-off-by: Mike Pagano <mpagano@gentoo.org>
-rw-r--r--0000_README4
-rw-r--r--1800_gcc-plugins-stackleak-Avoid-head-text-section.patch36
2 files changed, 0 insertions, 40 deletions
diff --git a/0000_README b/0000_README
index 1380bd5c..ba3f48c8 100644
--- a/0000_README
+++ b/0000_README
@@ -83,10 +83,6 @@ Patch: 1730_parisc-Disable-prctl.patch
From: https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git
Desc: prctl: Temporarily disable prctl(PR_SET_MDWE) on parisc
-Patch: 1800_gcc-plugins-stackleak-Avoid-head-text-section.patch
-From: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-Desc: gcc-plugins/stackleak: Avoid .head.text section
-
Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw
Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758
diff --git a/1800_gcc-plugins-stackleak-Avoid-head-text-section.patch b/1800_gcc-plugins-stackleak-Avoid-head-text-section.patch
deleted file mode 100644
index 28964f01..00000000
--- a/1800_gcc-plugins-stackleak-Avoid-head-text-section.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e7d24c0aa8e678f41457d1304e2091cac6fd1a2e Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ardb@kernel.org>
-Date: Thu, 28 Mar 2024 07:42:57 +0100
-Subject: gcc-plugins/stackleak: Avoid .head.text section
-
-The .head.text section carries the startup code that runs with the MMU
-off or with a translation of memory that deviates from the ordinary one.
-So avoid instrumentation with the stackleak plugin, which already avoids
-.init.text and .noinstr.text entirely.
-
-Fixes: 48204aba801f1b51 ("x86/sme: Move early SME kernel encryption handling into .head.text")
-Reported-by: kernel test robot <oliver.sang@intel.com>
-Closes: https://lore.kernel.org/oe-lkp/202403221630.2692c998-oliver.sang@intel.com
-Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
-Link: https://lore.kernel.org/r/20240328064256.2358634-2-ardb+git@google.com
-Signed-off-by: Kees Cook <keescook@chromium.org>
----
- scripts/gcc-plugins/stackleak_plugin.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/scripts/gcc-plugins/stackleak_plugin.c b/scripts/gcc-plugins/stackleak_plugin.c
-index c5c2ce113c9232..d20c47d21ad835 100644
---- a/scripts/gcc-plugins/stackleak_plugin.c
-+++ b/scripts/gcc-plugins/stackleak_plugin.c
-@@ -467,6 +467,8 @@ static bool stackleak_gate(void)
- return false;
- if (STRING_EQUAL(section, ".entry.text"))
- return false;
-+ if (STRING_EQUAL(section, ".head.text"))
-+ return false;
- }
-
- return track_frame_size >= 0;
---
-cgit 1.2.3-korg
-