commit 6436c12a2ced865a3382b867e3882d08c2d2bf8d
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Fri Aug 7 08:10:47 2026 +0200

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

commit 6703dba1d14cbd6647cd1ccfa3a3fa94b64dd096
Author: Borislav Petkov (AMD) <bp@alien8.de>
Date:   Tue Jun 2 21:26:44 2026 -0700

    x86/bugs: Make Safe-RET robust against interrupt injection
    
    commit 7e7f81cf6f5ca3311e526308f55d7c54d3ba71f9 upstream.
    
    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 4c34a21ff85ce1e066afac4023e56e5f193ab668
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Fri Aug 7 07:41:07 2026 +0200

    Revert "x86/bugs: Make Safe-RET robust against interrupt injection"
    
    This reverts commit 608c8f5dccaaf8b8d2b28c0fbdd439d144be62b0 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>