]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/speculation: Add LFENCE to RSB fill sequence
authorPawan Gupta <pawan.kumar.gupta@linux.intel.com>
Tue, 2 Aug 2022 22:47:02 +0000 (15:47 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Aug 2022 10:57:53 +0000 (12:57 +0200)
commitb58882c69f6633dcebd66bdb38658f688aa52ec9
treeaf62c4e3306551f34980fd6f352e311060f2920b
parentf2f41ef0352db9679bfae250d7a44b3113f3a3cc
x86/speculation: Add LFENCE to RSB fill sequence

commit ba6e31af2be96c4d0536f2152ed6f7b6c11bca47 upstream.

RSB fill sequence does not have any protection for miss-prediction of
conditional branch at the end of the sequence. CPU can speculatively
execute code immediately after the sequence, while RSB filling hasn't
completed yet.

  #define __FILL_RETURN_BUFFER(reg, nr, sp) \
   mov $(nr/2), reg; \
  771: \
   call 772f; \
  773: /* speculation trap */ \
   pause; \
   lfence; \
   jmp 773b; \
  772: \
   call 774f; \
  775: /* speculation trap */ \
   pause; \
   lfence; \
   jmp 775b; \
  774: \
   dec reg; \
   jnz 771b;  <----- CPU can miss-predict here. \
   add $(BITS_PER_LONG/8) * nr, sp;

Before RSB is filled, RETs that come in program order after this macro
can be executed speculatively, making them vulnerable to RSB-based
attacks.

Mitigate it by adding an LFENCE after the conditional branch to prevent
speculation while RSB is being filled.

Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/include/asm/nospec-branch.h