commit c7ba9d6de43e9d9bd755b1f3c19501a38898c6b6
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Thu Aug 6 19:28:04 2026 +0200

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

commit 61649a2d61cb0dbc673f0f232f0f0c298bf50442
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>