From: "Radim Krčmář" <rkrcmar@redhat.com>
To: linux@vger.kernel.org
Cc: kvm@vger.kernel.org, Dan Carpenter <dan.carpenter@oracle.com>,
Feng Wu <feng.wu@intel.com>, Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH] KVM: x86: fix *NULL on invalid low-prio irq
Date: Fri, 12 Feb 2016 15:00:15 +0100 [thread overview]
Message-ID: <1455285615-6631-1-git-send-email-rkrcmar@redhat.com> (raw)
In-Reply-To: <20160211045041.GA6196@mwanda>
Smatch noticed a NULL dereference in kvm_intr_is_single_vcpu_fast that
happens if VM already warned about invalid lowest-priority interrupt.
Create a function for common code while fixing it.
Fixes: 6228a0da8057 ("KVM: x86: Add lowest-priority support for vt-d posted-interrupts")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
arch/x86/kvm/lapic.c | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 1482a581a83c..cf74404230ca 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -685,6 +685,15 @@ int kvm_vector_to_index(u32 vector, u32 dest_vcpus,
return idx;
}
+static void kvm_apic_disabled_lapic_found(struct kvm *kvm)
+{
+ if (!kvm->arch.disabled_lapic_found) {
+ kvm->arch.disabled_lapic_found = true;
+ printk(KERN_INFO
+ "Disabled LAPIC found during irq injection\n");
+ }
+}
+
bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src,
struct kvm_lapic_irq *irq, int *r, unsigned long *dest_map)
{
@@ -763,15 +772,8 @@ bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src,
idx = kvm_vector_to_index(irq->vector,
dest_vcpus, &bitmap, 16);
- /*
- * We may find a hardware disabled LAPIC here, if that
- * is the case, print out a error message once for each
- * guest and return.
- */
- if (!dst[idx] && !kvm->arch.disabled_lapic_found) {
- kvm->arch.disabled_lapic_found = true;
- printk(KERN_INFO
- "Disabled LAPIC found during irq injection\n");
+ if (!dst[idx]) {
+ kvm_apic_disabled_lapic_found(kvm);
goto out;
}
@@ -859,16 +861,9 @@ bool kvm_intr_is_single_vcpu_fast(struct kvm *kvm, struct kvm_lapic_irq *irq,
idx = kvm_vector_to_index(irq->vector, dest_vcpus,
&bitmap, 16);
- /*
- * We may find a hardware disabled LAPIC here, if that
- * is the case, print out a error message once for each
- * guest and return
- */
dst = map->logical_map[cid][idx];
- if (!dst && !kvm->arch.disabled_lapic_found) {
- kvm->arch.disabled_lapic_found = true;
- printk(KERN_INFO
- "Disabled LAPIC found during irq injection\n");
+ if (!dst) {
+ kvm_apic_disabled_lapic_found(kvm);
goto out;
}
--
2.7.1
next prev parent reply other threads:[~2016-02-12 14:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 4:50 KVM: x86: Add lowest-priority support for vt-d posted-interrupts Dan Carpenter
2016-02-12 14:00 ` Radim Krčmář [this message]
2016-02-12 14:10 ` [PATCH] KVM: x86: fix *NULL on invalid low-prio irq Wu, Feng
2016-02-12 14:27 ` Radim Krcmár
2016-02-12 14:32 ` Wu, Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455285615-6631-1-git-send-email-rkrcmar@redhat.com \
--to=rkrcmar@redhat.com \
--cc=dan.carpenter@oracle.com \
--cc=feng.wu@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux@vger.kernel.org \
--cc=pbonzini@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.