KVM: nSVM: avoid picking up unsupported bits from L2 in int_ctl (CVE-2021-3653)
authorMaxim Levitsky <mlevitsk@redhat.com>
Wed, 14 Jul 2021 22:56:24 +0000 (01:56 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Aug 2021 06:59:18 +0000 (08:59 +0200)
commitc0883f693187c646c0972d73e525523f9486c2e3
treec0c5392511358add4b546429627bcc9ed85af65f
parentb5f05bdfda28847305e80839477a1160ddb68b94
KVM: nSVM: avoid picking up unsupported bits from L2 in int_ctl (CVE-2021-3653)

commit 0f923e07124df069ba68d8bb12324398f4b6b709 upstream.

* Invert the mask of bits that we pick from L2 in
  nested_vmcb02_prepare_control

* Invert and explicitly use VIRQ related bits bitmask in svm_clear_vintr

This fixes a security issue that allowed a malicious L1 to run L2 with
AVIC enabled, which allowed the L2 to exploit the uninitialized and enabled
AVIC to read/write the host physical memory at some offsets.

Fixes: 3d6368ef580a ("KVM: SVM: Add VMRUN handler")
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/include/asm/svm.h
arch/x86/kvm/svm/nested.c
arch/x86/kvm/svm/svm.c