From: Greg Kroah-Hartman Date: Mon, 30 Jan 2023 13:49:56 +0000 (+0100) Subject: 4.19-stable patches X-Git-Tag: v5.10.166~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=027fa44847c07600be01152b5abf8d49c2d58d6e;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19-stable patches added patches: x86-entry-64-add-instruction-suffix-to-sysret.patch --- diff --git a/queue-4.19/series b/queue-4.19/series index f5b52dc6d63..dee5ba625af 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -64,3 +64,4 @@ revert-input-synaptics-switch-touchpad-on-hp-laptop-15-da3001tu-to-rmi-mode.patc x86-i8259-mark-legacy-pic-interrupts-with-irq_level.patch drm-i915-display-fix-compiler-warning-about-array-overrun.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.19/x86-entry-64-add-instruction-suffix-to-sysret.patch b/queue-4.19/x86-entry-64-add-instruction-suffix-to-sysret.patch new file mode 100644 index 00000000000..9cb1c39b5e1 --- /dev/null +++ b/queue-4.19/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 +Date: Mon, 16 Dec 2019 11:40:03 +0100 +Subject: x86/entry/64: Add instruction suffix to SYSRET + +From: Jan Beulich + +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 +Signed-off-by: Borislav Petkov +Acked-by: Andy Lutomirski +Link: https://lkml.kernel.org/r/038a7c35-062b-a285-c6d2-653b56585844@suse.com +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -1759,7 +1759,7 @@ END(nmi) + ENTRY(ignore_sysret) + UNWIND_HINT_EMPTY + mov $-ENOSYS, %eax +- sysret ++ sysretl + END(ignore_sysret) + + ENTRY(rewind_stack_do_exit)