From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 6 Dec 2022 12:26:30 +0000 (+0100)
Subject: 4.19-stable patches
X-Git-Tag: v4.9.335~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f6e57e9847b68d5b77d650016938ea3c16f34b3;p=thirdparty%2Fkernel%2Fstable-queue.git

4.19-stable patches

added patches:
	revert-x86-speculation-change-fill_return_buffer-to-work-with-objtool.patch
---

diff --git a/queue-4.19/revert-x86-speculation-change-fill_return_buffer-to-work-with-objtool.patch b/queue-4.19/revert-x86-speculation-change-fill_return_buffer-to-work-with-objtool.patch
new file mode 100644
index 00000000000..5dab0853004
--- /dev/null
+++ b/queue-4.19/revert-x86-speculation-change-fill_return_buffer-to-work-with-objtool.patch
@@ -0,0 +1,63 @@
+From ben@decadent.org.uk  Tue Dec  6 13:25:30 2022
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Mon, 5 Dec 2022 22:31:24 +0100
+Subject: Revert "x86/speculation: Change FILL_RETURN_BUFFER to work with objtool"
+To: stable@vger.kernel.org
+Cc: Peter Zijlstra <peterz@infradead.org>, Alexandre Chartre <alexandre.chartre@oracle.com>, Josh Poimboeuf <jpoimboe@redhat.com>, Thadeu Lima de Souza Cascardo <cascardo@canonical.com>, Suleiman Souhlal <suleiman@google.com>
+Message-ID: <Y45jLPqv/0fJ+rmk@decadent.org.uk>
+Content-Disposition: inline
+
+From: Ben Hutchings <ben@decadent.org.uk>
+
+This reverts commit 9f3330d4930e034d84ee6561fbfb098433ff0ab9, which
+was commit 089dd8e53126ebaf506e2dc0bf89d652c36bfc12 upstream.
+
+The necessary changes to objtool have not been backported to 4.19.
+Backporting this commit alone only added build warnings.
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/include/asm/nospec-branch.h |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/arch/x86/include/asm/nospec-branch.h
++++ b/arch/x86/include/asm/nospec-branch.h
+@@ -4,13 +4,11 @@
+ #define _ASM_X86_NOSPEC_BRANCH_H_
+ 
+ #include <linux/static_key.h>
+-#include <linux/frame.h>
+ 
+ #include <asm/alternative.h>
+ #include <asm/alternative-asm.h>
+ #include <asm/cpufeatures.h>
+ #include <asm/msr-index.h>
+-#include <asm/unwind_hints.h>
+ #include <asm/percpu.h>
+ 
+ /*
+@@ -54,9 +52,9 @@
+ 	lfence;					\
+ 	jmp	775b;				\
+ 774:						\
+-	add	$(BITS_PER_LONG/8) * 2, sp;	\
+ 	dec	reg;				\
+ 	jnz	771b;				\
++	add	$(BITS_PER_LONG/8) * nr, sp;	\
+ 	/* barrier for jnz misprediction */	\
+ 	lfence;
+ #else
+@@ -167,8 +165,10 @@
+   * monstrosity above, manually.
+   */
+ .macro FILL_RETURN_BUFFER reg:req nr:req ftr:req
+-	ALTERNATIVE "jmp .Lskip_rsb_\@", "", \ftr
+-	__FILL_RETURN_BUFFER(\reg,\nr,%_ASM_SP)
++	ANNOTATE_NOSPEC_ALTERNATIVE
++	ALTERNATIVE "jmp .Lskip_rsb_\@",				\
++		__stringify(__FILL_RETURN_BUFFER(\reg,\nr,%_ASM_SP))	\
++		\ftr
+ .Lskip_rsb_\@:
+ .endm
+ 
diff --git a/queue-4.19/series b/queue-4.19/series
index b6251ebd56f..5eea8323b3a 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -60,6 +60,7 @@ spi-spi-imx-fix-spi_bus_clk-if-requested-clock-is-hi.patch
 proc-avoid-integer-type-confusion-in-get_proc_long.patch
 proc-proc_skip_spaces-shouldn-t-think-it-is-working-on-c-strings.patch
 v4l2-don-t-fall-back-to-follow_pfn-if-pin_user_pages_fast-fails.patch
+revert-x86-speculation-change-fill_return_buffer-to-work-with-objtool.patch
 kbuild-fix-wimplicit-function-declaration-in-license.patch
 iio-health-afe4403-fix-oob-read-in-afe4403_read_raw.patch
 iio-health-afe4404-fix-oob-read-in-afe4404_-read-wri.patch