From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Aug 2026 00:02:58 +0000 (-0700)
Subject: Merge tag 'x86_bugs_saferet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f5fdd6665ac4d8528ed1c9242cb1cf7a7f5bdb0e;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'x86_bugs_saferet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

 - Add a mitigation for the attack vector of interrupting the saferet
   sequence used in the SRSO mitigation and still poisoning the RSB.

   Do that by emulating the saferet sequence and thus avoiding executing
   a RET instruction.

* tag 'x86_bugs_saferet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/bugs: Make Safe-RET robust against interrupt injection
---

f5fdd6665ac4d8528ed1c9242cb1cf7a7f5bdb0e