4.14-stable patches

added patches:
	x86-entry-64-add-instruction-suffix-to-sysret.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index d5a161c61a1fcd8e08c24e017cd943f739360a46..15a5f43b10c3eafe72ac1a7eb2e743008b751475 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -42,3 +42,4 @@ xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch
 drm-radeon-dp-make-radeon_dp_get_dp_link_config-static.patch
 scsi-qla2xxx-don-t-break-the-bsg-lib-abstractions.patch
 x86-asm-fix-an-assembler-warning-with-current-binutils.patch
+x86-entry-64-add-instruction-suffix-to-sysret.patch

diff --git a/queue-4.14/x86-entry-64-add-instruction-suffix-to-sysret.patch b/queue-4.14/x86-entry-64-add-instruction-suffix-to-sysret.patch
new file mode 100644 (file)
index 0000000..48b3f7a
--- /dev/null
+++ b/queue-4.14/x86-entry-64-add-instruction-suffix-to-sysret.patch
@@ -0,0 +1,35 @@
+From b2b1d94cdfd4e906d3936dab2850096a4a0c2017 Mon Sep 17 00:00:00 2001
+From: Jan Beulich <jbeulich@suse.com>
+Date: Mon, 16 Dec 2019 11:40:03 +0100
+Subject: x86/entry/64: Add instruction suffix to SYSRET
+
+From: Jan Beulich <jbeulich@suse.com>
+
+commit b2b1d94cdfd4e906d3936dab2850096a4a0c2017 upstream.
+
+ignore_sysret() contains an unsuffixed SYSRET instruction. gas correctly
+interprets this as SYSRETL, but leaving it up to gas to guess when there
+is no register operand that implies a size is bad practice, and upstream
+gas is likely to warn about this in the future. Use SYSRETL explicitly.
+This does not change the assembled output.
+
+Signed-off-by: Jan Beulich <jbeulich@suse.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Acked-by: Andy Lutomirski <luto@kernel.org>
+Link: https://lkml.kernel.org/r/038a7c35-062b-a285-c6d2-653b56585844@suse.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/entry/entry_64.S |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/entry/entry_64.S
++++ b/arch/x86/entry/entry_64.S
+@@ -1669,7 +1669,7 @@ END(nmi)
+ ENTRY(ignore_sysret)
+       UNWIND_HINT_EMPTY
+       mov     $-ENOSYS, %eax
+-      sysret
++      sysretl
+ END(ignore_sysret)
+ 
+ ENTRY(rewind_stack_do_exit)