]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
KVM: x86: Check lapic_in_kernel() before attempting to set a SynIC irq
authorVitaly Kuznetsov <vkuznets@redhat.com>
Wed, 10 Aug 2022 20:24:38 +0000 (23:24 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 21 Aug 2022 13:16:25 +0000 (15:16 +0200)
commit 7ec37d1cbe17d8189d9562178d8b29167fe1c31a upstream

When KVM_CAP_HYPERV_SYNIC{,2} is activated, KVM already checks for
irqchip_in_kernel() so normally SynIC irqs should never be set. It is,
however,  possible for a misbehaving VMM to write to SYNIC/STIMER MSRs
causing erroneous behavior.

The immediate issue being fixed is that kvm_irq_delivery_to_apic()
(kvm_irq_delivery_to_apic_fast()) crashes when called with
'irq.shorthand = APIC_DEST_SELF' and 'src == NULL'.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20220325132140.25650-2-vkuznets@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Ghinea <stefan.ghinea@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kvm/hyperv.c

index d806139377bc684aca5fef4593c34ec86f8151fc..09ec1cda2d687c517a3bfe5de1f94899f1b5f8e7 100644 (file)
@@ -428,6 +428,9 @@ static int synic_set_irq(struct kvm_vcpu_hv_synic *synic, u32 sint)
        struct kvm_lapic_irq irq;
        int ret, vector;
 
+       if (KVM_BUG_ON(!lapic_in_kernel(vcpu), vcpu->kvm))
+               return -EINVAL;
+
        if (sint >= ARRAY_SIZE(synic->sint))
                return -EINVAL;