From: Greg Kroah-Hartman Date: Mon, 30 Jan 2023 13:49:46 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v5.10.166~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0f02ad68ba76bb142c1e000e5aaeaa65df1688a;p=thirdparty%2Fkernel%2Fstable-queue.git 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 d5a161c61a1..15a5f43b10c 100644 --- 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 index 00000000000..48b3f7a1b7c --- /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 +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 +@@ -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)