From: Greg Kroah-Hartman Date: Sat, 13 May 2023 08:17:37 +0000 (+0900) Subject: drop x86-retbleed-fix-return-thunk-alignment.patch from 5.10 and 5.15 X-Git-Tag: v4.14.315~72 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce911370db6d399c737e8a111d402a1220b6483c;p=thirdparty%2Fkernel%2Fstable-queue.git drop x86-retbleed-fix-return-thunk-alignment.patch from 5.10 and 5.15 broke the build :( --- diff --git a/queue-5.10/series b/queue-5.10/series index ab62b0dc556..7280b57b53d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -335,7 +335,6 @@ perf-pmu-zfree-expects-a-pointer-to-a-pointer-to-zer.patch perf-map-delete-two-variable-initialisations-before-.patch crypto-sun8i-ss-fix-a-test-in-sun8i_ss_setup_ivs.patch perf-symbols-fix-return-incorrect-build_id-size-in-e.patch -x86-retbleed-fix-return-thunk-alignment.patch btrfs-fix-btrfs_prev_leaf-to-not-return-the-same-key-twice.patch btrfs-don-t-free-qgroup-space-unless-specified.patch btrfs-print-tree-parent-bytenr-must-be-aligned-to-sector-size.patch diff --git a/queue-5.10/x86-retbleed-fix-return-thunk-alignment.patch b/queue-5.10/x86-retbleed-fix-return-thunk-alignment.patch deleted file mode 100644 index 7ccb2b95156..00000000000 --- a/queue-5.10/x86-retbleed-fix-return-thunk-alignment.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9a48d604672220545d209e9996c2a1edbb5637f6 Mon Sep 17 00:00:00 2001 -From: "Borislav Petkov (AMD)" -Date: Fri, 12 May 2023 23:12:26 +0200 -Subject: x86/retbleed: Fix return thunk alignment - -From: Borislav Petkov (AMD) - -commit 9a48d604672220545d209e9996c2a1edbb5637f6 upstream. - -SYM_FUNC_START_LOCAL_NOALIGN() adds an endbr leading to this layout -(leaving only the last 2 bytes of the address): - - 3bff : - 3bff: f3 0f 1e fa endbr64 - 3c03: f6 test $0xcc,%bl - - 3c04 <__x86_return_thunk>: - 3c04: c3 ret - 3c05: cc int3 - 3c06: 0f ae e8 lfence - -However, "the RET at __x86_return_thunk must be on a 64 byte boundary, -for alignment within the BTB." - -Use SYM_START instead. - -Signed-off-by: Borislav Petkov (AMD) -Reviewed-by: Thomas Gleixner -Cc: -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman ---- - arch/x86/lib/retpoline.S | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/x86/lib/retpoline.S -+++ b/arch/x86/lib/retpoline.S -@@ -86,8 +86,8 @@ SYM_CODE_END(__x86_indirect_thunk_array) - */ - .align 64 - .skip 63, 0xcc --SYM_FUNC_START_NOALIGN(zen_untrain_ret); -- -+SYM_START(zen_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) -+ ANNOTATE_NOENDBR - /* - * As executed from zen_untrain_ret, this is: - * diff --git a/queue-5.15/series b/queue-5.15/series index f9475ff333f..2a33e567ad3 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -61,7 +61,6 @@ crypto-engine-fix-crypto_queue-backlog-handling.patch perf-symbols-fix-return-incorrect-build_id-size-in-e.patch perf-evlist-refactor-evlist__for_each_cpu.patch perf-stat-separate-bperf-from-bpf_profiler.patch -x86-retbleed-fix-return-thunk-alignment.patch btrfs-fix-btrfs_prev_leaf-to-not-return-the-same-key-twice.patch btrfs-zoned-fix-wrong-use-of-bitops-api-in-btrfs_ensure_empty_zones.patch btrfs-fix-encoded-write-i_size-corruption-with-no-holes.patch diff --git a/queue-5.15/x86-retbleed-fix-return-thunk-alignment.patch b/queue-5.15/x86-retbleed-fix-return-thunk-alignment.patch deleted file mode 100644 index 7ccb2b95156..00000000000 --- a/queue-5.15/x86-retbleed-fix-return-thunk-alignment.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9a48d604672220545d209e9996c2a1edbb5637f6 Mon Sep 17 00:00:00 2001 -From: "Borislav Petkov (AMD)" -Date: Fri, 12 May 2023 23:12:26 +0200 -Subject: x86/retbleed: Fix return thunk alignment - -From: Borislav Petkov (AMD) - -commit 9a48d604672220545d209e9996c2a1edbb5637f6 upstream. - -SYM_FUNC_START_LOCAL_NOALIGN() adds an endbr leading to this layout -(leaving only the last 2 bytes of the address): - - 3bff : - 3bff: f3 0f 1e fa endbr64 - 3c03: f6 test $0xcc,%bl - - 3c04 <__x86_return_thunk>: - 3c04: c3 ret - 3c05: cc int3 - 3c06: 0f ae e8 lfence - -However, "the RET at __x86_return_thunk must be on a 64 byte boundary, -for alignment within the BTB." - -Use SYM_START instead. - -Signed-off-by: Borislav Petkov (AMD) -Reviewed-by: Thomas Gleixner -Cc: -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman ---- - arch/x86/lib/retpoline.S | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/arch/x86/lib/retpoline.S -+++ b/arch/x86/lib/retpoline.S -@@ -86,8 +86,8 @@ SYM_CODE_END(__x86_indirect_thunk_array) - */ - .align 64 - .skip 63, 0xcc --SYM_FUNC_START_NOALIGN(zen_untrain_ret); -- -+SYM_START(zen_untrain_ret, SYM_L_GLOBAL, SYM_A_NONE) -+ ANNOTATE_NOENDBR - /* - * As executed from zen_untrain_ret, this is: - *