linux/arch/x86/lib
Jim Mattson 596dedc6fa x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk
The linux-5.10-y backport of commit b377c66ae3 ("x86/retpoline: Add
NOENDBR annotation to the SRSO dummy return thunk") misplaced the new
NOENDBR annotation, repeating the annotation on __x86_return_thunk,
rather than adding the annotation to the !CONFIG_CPU_SRSO version of
srso_alias_untrain_ret, as intended.

Move the annotation to the right place.

Fixes: 0bdc64e9e7 ("x86/retpoline: Add NOENDBR annotation to the SRSO dummy return thunk")
Reported-by: Greg Thelen <gthelen@google.com>
Signed-off-by: Jim Mattson <jmattson@google.com>
Acked-by: Borislav Petkov (AMD) <bp@alien8.de>
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-07-18 13:05:50 +02:00
..
.gitignore .gitignore: add SPDX License Identifier 2020-03-25 11:50:48 +01:00
atomic64_32.c
atomic64_386_32.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
atomic64_cx8_32.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
cache-smp.c smp: Remove smp_call_function() and on_each_cpu() return values 2019-06-23 14:26:26 +02:00
checksum_32.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
clear_page_64.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
cmdline.c treewide: Use fallthrough pseudo-keyword 2020-08-23 17:36:59 -05:00
cmpxchg8b_emu.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
cmpxchg16b_emu.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
copy_mc_64.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
copy_mc.c iov_iter, x86: Be consistent about the __user tag on copy_mc_to_user() 2023-11-20 11:06:43 +01:00
copy_page_64.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
copy_user_64.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
cpu.c x86/lib/cpu: Address missing prototypes warning 2019-08-08 08:25:53 +02:00
csum-copy_64.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
csum-partial_64.c x86/lib: Fix indentation issue, remove extra tab 2019-03-21 12:24:38 +01:00
csum-wrappers_64.c amd64: switch csum_partial_copy_generic() to new calling conventions 2020-08-20 15:45:22 -04:00
delay.c x86/delay: Fix the wrong asm constraint in delay_loop() 2022-06-09 10:21:00 +02:00
error-inject.c x86: Prepare inline-asm for straight-line-speculation 2022-07-25 11:26:29 +02:00
getuser.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
hweight.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
inat.c x86/insn: Add a __ignore_sync_check__ marker 2022-07-25 11:26:11 +02:00
insn-eval.c x86/stackprotector/32: Make the canary into a regular percpu variable 2024-04-13 12:58:45 +02:00
insn.c x86/insn: Add an insn_decode() API 2022-07-25 11:26:11 +02:00
iomap_copy_64.S x86/asm: Fix an assembler warning with current binutils 2023-01-24 07:19:56 +01:00
iomem.c x86: explicitly align IO accesses in memcpy_{to,from}io 2019-02-01 09:07:48 -08:00
kaslr.c x86/kaslr: Fix incorrect i8254 outb() parameters 2019-01-11 21:35:47 +01:00
Makefile * Extend the recovery from MCE in kernel space also to processes which 2020-10-12 10:14:38 -07:00
memcpy_32.c
memcpy_64.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
memmove_64.S x86: Use return-thunk in asm code 2022-07-25 11:26:39 +02:00
memset_64.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
misc.c x86/lib: Fix overflow when counting digits 2024-01-25 14:37:39 -08:00
mmx_32.c x86/mmx: Use KFPU_387 for MMX string operations 2021-01-27 11:55:13 +01:00
msr-reg-export.c
msr-reg.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
msr-smp.c x86/msr: Fix wr/rdmsr_safe_regs_on_cpu() prototypes 2021-05-22 11:40:51 +02:00
msr.c
putuser.S x86: Prepare asm files for straight-line-speculation 2022-07-25 11:26:28 +02:00
retpoline.S x86/retpoline: Move a NOENDBR annotation to the SRSO dummy return thunk 2024-07-18 13:05:50 +02:00
string_32.c
strstr_32.c
usercopy_32.c docs/core-api/mm: fix user memory accessors formatting 2019-03-05 21:07:20 -08:00
usercopy_64.c x86: __memcpy_flushcache: fix wrong alignment if size > 2^32 2022-05-09 09:05:06 +02:00
usercopy.c x86/nmi: Fix NMI uaccess race against CR3 switching 2018-08-31 17:08:22 +02:00
x86-opcode-map.txt x86/insn: Fix PUSH instruction in x86 instruction decoder opcode map 2024-06-16 13:32:13 +02:00