diff options
| author | Borislav Petkov (AMD) <[email protected]> | 2023-05-12 21:12:26 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2023-05-12 22:19:53 +0000 |
| commit | 9a48d604672220545d209e9996c2a1edbb5637f6 (patch) | |
| tree | 8e6235d2df95972cc333f43e406f39f70d6b6f2f /lib/debugobjects.c | |
| parent | Merge tag 'for-6.4-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | kernel-9a48d604672220545d209e9996c2a1edbb5637f6.tar.gz kernel-9a48d604672220545d209e9996c2a1edbb5637f6.zip | |
x86/retbleed: Fix return thunk alignment
SYM_FUNC_START_LOCAL_NOALIGN() adds an endbr leading to this layout
(leaving only the last 2 bytes of the address):
3bff <zen_untrain_ret>:
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) <[email protected]>
Reviewed-by: Thomas Gleixner <[email protected]>
Cc: <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'lib/debugobjects.c')
0 files changed, 0 insertions, 0 deletions
