commit e4f7d8be268ecf717f94ee2e242afa79ddeacaed
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Fri Aug 7 08:09:27 2026 +0200

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

commit d0208e08d64d99383e09852a76cc3038c5a4c3ab
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
    
    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: Wenkuan Wang <Wenkuan.Wang@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 097bdadb0568e917d230eba97fed88aae02f6f17
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Fri Aug 7 07:46:45 2026 +0200

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