* [PATCH 4.14.y] KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656)
@ 2021-08-16 14:02 Paolo Bonzini
2021-08-16 14:26 ` Greg KH
2021-08-16 14:46 ` Greg KH
0 siblings, 2 replies; 4+ messages in thread
From: Paolo Bonzini @ 2021-08-16 14:02 UTC (permalink / raw)
To: linux-kernel, kvm; +Cc: stable, Maxim Levitsky
From: Maxim Levitsky <mlevitsk@redhat.com>
[ 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 <pbonzini@redhat.com>
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
The above upstream SHA1 is still on its way to Linus
arch/x86/kvm/svm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 0dfd0af61a29..439aecbbdd1e 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -389,6 +389,9 @@ static void recalc_intercepts(struct vcpu_svm *svm)
c->intercept_dr = h->intercept_dr | g->intercept_dr;
c->intercept_exceptions = h->intercept_exceptions | g->intercept_exceptions;
c->intercept = h->intercept | g->intercept;
+
+ c->intercept |= (1ULL << INTERCEPT_VMLOAD);
+ c->intercept |= (1ULL << INTERCEPT_VMSAVE);
}
static inline struct vmcb *get_host_vmcb(struct vcpu_svm *svm)
--
2.26.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 4.14.y] KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656)
2021-08-16 14:02 [PATCH 4.14.y] KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656) Paolo Bonzini
@ 2021-08-16 14:26 ` Greg KH
2021-08-16 14:42 ` Paolo Bonzini
2021-08-16 14:46 ` Greg KH
1 sibling, 1 reply; 4+ messages in thread
From: Greg KH @ 2021-08-16 14:26 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: linux-kernel, kvm, stable, Maxim Levitsky
On Mon, Aug 16, 2021 at 04:02:36PM +0200, Paolo Bonzini wrote:
> From: Maxim Levitsky <mlevitsk@redhat.com>
>
> [ upstream commit c7dfa4009965a9b2d7b329ee970eb8da0d32f0bc ]
This is not a commit in Linus's tree :(
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 4.14.y] KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656)
2021-08-16 14:26 ` Greg KH
@ 2021-08-16 14:42 ` Paolo Bonzini
0 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2021-08-16 14:42 UTC (permalink / raw)
To: Greg KH; +Cc: linux-kernel, kvm, stable, Maxim Levitsky
On 16/08/21 16:26, Greg KH wrote:
>>
>> [ upstream commit c7dfa4009965a9b2d7b329ee970eb8da0d32f0bc ]
>
> This is not a commit in Linus's tree:(
Not yet, that was remarked further down in the message. I sent the
stable patches at the same time as the embargo lifted.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 4.14.y] KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656)
2021-08-16 14:02 [PATCH 4.14.y] KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656) Paolo Bonzini
2021-08-16 14:26 ` Greg KH
@ 2021-08-16 14:46 ` Greg KH
1 sibling, 0 replies; 4+ messages in thread
From: Greg KH @ 2021-08-16 14:46 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: linux-kernel, kvm, stable, Maxim Levitsky
On Mon, Aug 16, 2021 at 04:02:36PM +0200, Paolo Bonzini wrote:
> From: Maxim Levitsky <mlevitsk@redhat.com>
>
> [ 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 <pbonzini@redhat.com>
> Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> The above upstream SHA1 is still on its way to Linus
Ah, missed this down here, I read top-to-bottom and stopped at the
second line :)
Anyway, will wait for Linus to pick these up first.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-16 14:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-16 14:02 [PATCH 4.14.y] KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656) Paolo Bonzini
2021-08-16 14:26 ` Greg KH
2021-08-16 14:42 ` Paolo Bonzini
2021-08-16 14:46 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.