drop efi-libstub-disable-shadow-call-stack.patch

from 5.4, 4.19, and 4.14

diff --git a/queue-4.14/efi-libstub-disable-shadow-call-stack.patch b/queue-4.14/efi-libstub-disable-shadow-call-stack.patch
deleted file mode 100644 (file)
index 62f98d5..0000000
--- a/queue-4.14/efi-libstub-disable-shadow-call-stack.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 55705a151da312dbfb05b8e47e6a40f58f6f29ff Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Apr 2020 09:00:18 -0700
-Subject: efi/libstub: Disable Shadow Call Stack
-
-From: Sami Tolvanen <samitolvanen@google.com>
-
-[ Upstream commit cc49c71d2abe99c1c2c9bedf0693ad2d3ee4a067 ]
-
-Shadow stacks are not available in the EFI stub, filter out SCS flags.
-
-Suggested-by: James Morse <james.morse@arm.com>
-Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
-Reviewed-by: Kees Cook <keescook@chromium.org>
-Acked-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Will Deacon <will@kernel.org>
-Stable-dep-of: 1a3887924a7e ("efi: libstub: Disable struct randomization")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/firmware/efi/libstub/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
-index 678bc910e080..54dbcec7e06f 100644
---- a/drivers/firmware/efi/libstub/Makefile
-+++ b/drivers/firmware/efi/libstub/Makefile
-@@ -23,6 +23,9 @@ KBUILD_CFLAGS                        := $(cflags-y) -DDISABLE_BRANCH_PROFILING \
-                                  $(call cc-option,-ffreestanding) \
-                                  $(call cc-option,-fno-stack-protector)
- 
-+# remove SCS flags from all objects in this directory
-+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS))
-+
- GCOV_PROFILE                  := n
- KASAN_SANITIZE                        := n
- UBSAN_SANITIZE                        := n
--- 
-2.35.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 1ea88a28022807c487346678732c1d722e64e5c7..5623fb5b4dcdee889f0f075eb65d37fc8c2a199f 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -2,7 +2,6 @@ of-fdt-fix-off-by-one-error-in-unflatten_dt_nodes.patch
 gpio-mpc8xxx-fix-support-for-irq_type_level_low-flow.patch
 drm-meson-correct-osd1-global-alpha-value.patch
 parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch
-efi-libstub-disable-shadow-call-stack.patch
 cifs-don-t-send-down-the-destination-address-to-sendmsg-for-a-sock_stream.patch
 asoc-nau8824-fix-semaphore-unbalance-at-error-paths.patch
 regulator-pfuze100-fix-the-global-out-of-bounds-acce.patch

diff --git a/queue-4.19/efi-libstub-disable-shadow-call-stack.patch b/queue-4.19/efi-libstub-disable-shadow-call-stack.patch
deleted file mode 100644 (file)
index 7ee291a..0000000
--- a/queue-4.19/efi-libstub-disable-shadow-call-stack.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 617bdc131a75a444da24b369185c61fd864cba4d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Apr 2020 09:00:18 -0700
-Subject: efi/libstub: Disable Shadow Call Stack
-
-From: Sami Tolvanen <samitolvanen@google.com>
-
-[ Upstream commit cc49c71d2abe99c1c2c9bedf0693ad2d3ee4a067 ]
-
-Shadow stacks are not available in the EFI stub, filter out SCS flags.
-
-Suggested-by: James Morse <james.morse@arm.com>
-Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
-Reviewed-by: Kees Cook <keescook@chromium.org>
-Acked-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Will Deacon <will@kernel.org>
-Stable-dep-of: 1a3887924a7e ("efi: libstub: Disable struct randomization")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/firmware/efi/libstub/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
-index d3777d754984..e0cff3b942ac 100644
---- a/drivers/firmware/efi/libstub/Makefile
-+++ b/drivers/firmware/efi/libstub/Makefile
-@@ -31,6 +31,9 @@ KBUILD_CFLAGS                        := $(cflags-y) -DDISABLE_BRANCH_PROFILING \
-                                  $(call cc-option,-fno-addrsig) \
-                                  -D__DISABLE_EXPORTS
- 
-+# remove SCS flags from all objects in this directory
-+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS))
-+
- GCOV_PROFILE                  := n
- KASAN_SANITIZE                        := n
- UBSAN_SANITIZE                        := n
--- 
-2.35.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 7046702f820e698643a79146346b63b88775e584..93c3eac0a044dd09a99c853bed6e4788aa9d7542 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -2,7 +2,6 @@ of-fdt-fix-off-by-one-error-in-unflatten_dt_nodes.patch
 gpio-mpc8xxx-fix-support-for-irq_type_level_low-flow.patch
 drm-meson-correct-osd1-global-alpha-value.patch
 parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch
-efi-libstub-disable-shadow-call-stack.patch
 nvmet-fix-a-use-after-free.patch
 mvpp2-no-need-to-check-return-value-of-debugfs_creat.patch
 cifs-don-t-send-down-the-destination-address-to-sendmsg-for-a-sock_stream.patch

diff --git a/queue-5.4/efi-libstub-disable-shadow-call-stack.patch b/queue-5.4/efi-libstub-disable-shadow-call-stack.patch
deleted file mode 100644 (file)
index 702cb1c..0000000
--- a/queue-5.4/efi-libstub-disable-shadow-call-stack.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 71eff1e8b6af8ea09df48e7f63fcb2585248bdc7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 27 Apr 2020 09:00:18 -0700
-Subject: efi/libstub: Disable Shadow Call Stack
-
-From: Sami Tolvanen <samitolvanen@google.com>
-
-[ Upstream commit cc49c71d2abe99c1c2c9bedf0693ad2d3ee4a067 ]
-
-Shadow stacks are not available in the EFI stub, filter out SCS flags.
-
-Suggested-by: James Morse <james.morse@arm.com>
-Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
-Reviewed-by: Kees Cook <keescook@chromium.org>
-Acked-by: Ard Biesheuvel <ardb@kernel.org>
-Signed-off-by: Will Deacon <will@kernel.org>
-Stable-dep-of: 1a3887924a7e ("efi: libstub: Disable struct randomization")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/firmware/efi/libstub/Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
-index 8c5b5529dbc0..f3540d5dd276 100644
---- a/drivers/firmware/efi/libstub/Makefile
-+++ b/drivers/firmware/efi/libstub/Makefile
-@@ -31,6 +31,9 @@ KBUILD_CFLAGS                        := $(cflags-y) -DDISABLE_BRANCH_PROFILING \
-                                  $(call cc-option,-fno-addrsig) \
-                                  -D__DISABLE_EXPORTS
- 
-+# remove SCS flags from all objects in this directory
-+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_SCS), $(KBUILD_CFLAGS))
-+
- GCOV_PROFILE                  := n
- KASAN_SANITIZE                        := n
- UBSAN_SANITIZE                        := n
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 35ca7f31afedb16bf165f2920bccf5740a59a553..ce1ebfd94c831c64dbeae7586cc45fbd436d6fd4 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -4,7 +4,6 @@ gpio-mpc8xxx-fix-support-for-irq_type_level_low-flow.patch
 drm-meson-correct-osd1-global-alpha-value.patch
 drm-meson-fix-osd1-rgb-to-ycbcr-coefficient.patch
 parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch
-efi-libstub-disable-shadow-call-stack.patch
 alsa-pcm-oss-fix-race-at-sndctl_dsp_sync.patch
 task_stack-x86-cea-force-inline-stack-helpers.patch
 tracing-hold-caller_addr-to-hardirq_-enable-disable-.patch