4.9-stable patches

added patches:
	x86-build-disable-cet-instrumentation-in-the-kernel-for-32-bit-too.patch

diff --git a/queue-4.9/series b/queue-4.9/series
index b42082d5c950fd02f7f3f6d0b6bb475c523bb763..fc79ba54e424b41718564ceb343468b86fd6492b 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -32,3 +32,4 @@ net-vmw_vsock-improve-locking-in-vsock_connect_timeout.patch
 net-watchdog-hold-device-global-xmit-lock-during-tx-disable.patch
 vsock-virtio-update-credit-only-if-socket-is-not-closed.patch
 vsock-fix-locking-in-vsock_shutdown.patch
+x86-build-disable-cet-instrumentation-in-the-kernel-for-32-bit-too.patch

diff --git a/queue-4.9/x86-build-disable-cet-instrumentation-in-the-kernel-for-32-bit-too.patch b/queue-4.9/x86-build-disable-cet-instrumentation-in-the-kernel-for-32-bit-too.patch
new file mode 100644 (file)
index 0000000..cdb75ba
--- /dev/null
+++ b/queue-4.9/x86-build-disable-cet-instrumentation-in-the-kernel-for-32-bit-too.patch
@@ -0,0 +1,51 @@
+From 256b92af784d5043eeb7d559b6d5963dcc2ecb10 Mon Sep 17 00:00:00 2001
+From: Borislav Petkov <bp@suse.de>
+Date: Mon, 8 Feb 2021 16:43:30 +0100
+Subject: x86/build: Disable CET instrumentation in the kernel for 32-bit too
+
+From: Borislav Petkov <bp@suse.de>
+
+commit 256b92af784d5043eeb7d559b6d5963dcc2ecb10 upstream.
+
+Commit
+
+  20bf2b378729 ("x86/build: Disable CET instrumentation in the kernel")
+
+disabled CET instrumentation which gets added by default by the Ubuntu
+gcc9 and 10 by default, but did that only for 64-bit builds. It would
+still fail when building a 32-bit target. So disable CET for all x86
+builds.
+
+Fixes: 20bf2b378729 ("x86/build: Disable CET instrumentation in the kernel")
+Reported-by: AC <achirvasub@gmail.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
+Tested-by: AC <achirvasub@gmail.com>
+Link: https://lkml.kernel.org/r/YCCIgMHkzh/xT4ex@arch-chirva.localdomain
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/Makefile |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -61,6 +61,9 @@ endif
+ KBUILD_CFLAGS += -mno-sse -mno-mmx -mno-sse2 -mno-3dnow
+ KBUILD_CFLAGS += $(call cc-option,-mno-avx,)
+ 
++# Intel CET isn't enabled in the kernel
++KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)
++
+ ifeq ($(CONFIG_X86_32),y)
+         BITS := 32
+         UTS_MACHINE := i386
+@@ -137,9 +140,6 @@ else
+         KBUILD_CFLAGS += -mno-red-zone
+         KBUILD_CFLAGS += -mcmodel=kernel
+ 
+-      # Intel CET isn't enabled in the kernel
+-      KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)
+-
+         # -funit-at-a-time shrinks the kernel .text considerably
+         # unfortunately it makes reading oopses harder.
+         KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)