commit aabd761612dbeb7d40750d485da219d11433718a
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Fri Aug 7 08:07:31 2026 +0200

    Linux 5.15.215
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 52db77a13be224e09eb4ba6b4252ae8ab9085c2c
Author: Borislav Petkov (AMD) <bp@alien8.de>
Date:   Thu Aug 6 06:29:10 2026 -0700

    x86/bugs: Make Safe-RET robust against interrupt injection
    
    An attacker injecting interrupts while the Safe-RET mitigation executes
    on machines affected by SRSO can neutralize the safe return sequence,
    potentially leading to data leakage through speculative execution.
    
    Fixup register state as if the Safe-RET sequence executed successfully
    by "emulating" it, in a manner of speaking, and avoid executing a RET
    instruction after returning from the interrupt.
    
    Co-developed-by: David Kaplan <David.Kaplan@amd.com>
    Signed-off-by: David Kaplan <David.Kaplan@amd.com>
    Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
    Signed-off-by: Wenkuan Wang <Wenkuan.Wang@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 41285da14071a31729220bda683c0983246c011f
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Fri Aug 7 07:51:25 2026 +0200

    Revert "x86/bugs: Make Safe-RET robust against interrupt injection"
    
    This reverts commit 9c0b8105e919be5208c81d5516a194a28c58fe1e which is
    commit 7e7f81cf6f5ca3311e526308f55d7c54d3ba71f9 upstream.
    
    It was incorrect, a more correct fix will be applied next.
    
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>