OSDN Git Service

x86/retbleed: Fix return thunk alignment
authorBorislav Petkov (AMD) <bp@alien8.de>
Fri, 12 May 2023 21:12:26 +0000 (23:12 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 May 2023 22:19:53 +0000 (17:19 -0500)
commit9a48d604672220545d209e9996c2a1edbb5637f6
tree8e6235d2df95972cc333f43e406f39f70d6b6f2f
parent76c7f8873a7696dbd8f9cd844e30e5c84cbaba1a
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) <bp@alien8.de>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Cc: <stable@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/lib/retpoline.S