]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
KVM: nSVM: Pass next RIP, not current RIP, for nested VM-Exit on emulation
authorSean Christopherson <seanjc@google.com>
Sat, 1 Feb 2025 01:55:09 +0000 (17:55 -0800)
committerSean Christopherson <seanjc@google.com>
Mon, 24 Feb 2025 17:01:06 +0000 (09:01 -0800)
commitc8e612bfedff67da0dd4abdf4de9ce7671b89f71
tree2a6f0a00d543a934d2b6e43184903fa7031cf679
parentf002a97ec8c977ce64a23d68bed8c7a2cec9d96e
KVM: nSVM: Pass next RIP, not current RIP, for nested VM-Exit on emulation

Set "next_rip" in the emulation interception info passed to vendor code
using the emulator context's "_eip", not "eip".  "eip" holds RIP from the
start of emulation, i.e. the RIP of the instruction that's being emulated,
whereas _eip tracks the context's current position in decoding the code
stream, which at the time of the intercept checks is effectively the RIP
of the next instruction.

Passing the current RIP as next_rip causes SVM to stuff the wrong value
value into vmcb12->control.next_rip if a nested VM-Exit is generated, i.e.
if L1 wants to intercept the instruction, and could result in L1 putting
L2 into an infinite loop due to restarting L2 with the same RIP over and
over.

Fixes: 8a76d7f25f8f ("KVM: x86: Add x86 callback for intercept check")
Link: https://lore.kernel.org/r/20250201015518.689704-3-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/emulate.c