KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656)
Subsystems (2)
Paolo Bonzini
maintainerPATCH 1/1 KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656)
From: Maxim Levitsky <[email protected]>
[ upstream commit c7dfa4009965a9b2d7b329ee970eb8da0d32f0bc ]
If L1 disables VMLOAD/VMSAVE intercepts, and doesn't enable Virtual VMLOAD/VMSAVE (currently not supported for the nested hypervisor), then VMLOAD/VMSAVE must operate on the L1 physical memory, which is only possible by making L0 intercept these instructions.
Failure to do so allowed the nested guest to run VMLOAD/VMSAVE unintercepted, and thus read/write portions of the host physical memory.
Fixes 89c8a4984fc9 ("KVM: SVM: Enable Virtual VMLOAD VMSAVE feature")
Suggested-by Paolo Bonzini <[email protected]>
Signed-off-by Maxim Levitsky <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
---
The above upstream SHA1 is still on its way to Linus
arch/x86/kvm/svm/nested.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kvm/svm/nested.c +3 -0
@@ -147,6 +147,9 @@ void recalc_intercepts(struct vcpu_svm *svm)for (i =0 ; i <MAX_INTERCEPT ; i++) c->intercepts[i] |= g->intercepts[i]; + +vmcb_set_intercept (c,INTERCEPT_VMLOAD ); +vmcb_set_intercept (c,INTERCEPT_VMSAVE ); } static void copy_vmcb_control_area(struct vmcb_control_area *dst,
Signature · 1 line
2.26.3