aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-05 13:54:30 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-05 13:54:30 -0400
commit5698e9180cb70020bbf8b613174afe6308f902b0 (patch)
tree6dd869d9fbb2503330176b52d765833e6d6403bf
parentf80c43efb3f568acc1ff12731ecf2b4da4b2fe5c (diff)
parentf2ebd422f71cda9c791f76f85d2ca102ae34a1ed (diff)
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm fix from Avi Kivity: "A one-liner fix for a buffer overflow" * git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: Fix buffer overflow in kvm_set_irq()
-rw-r--r--virt/kvm/irq_comm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index a6a0365475ed..5afb43114020 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -332,6 +332,7 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt,
332 */ 332 */
333 hlist_for_each_entry(ei, n, &rt->map[ue->gsi], link) 333 hlist_for_each_entry(ei, n, &rt->map[ue->gsi], link)
334 if (ei->type == KVM_IRQ_ROUTING_MSI || 334 if (ei->type == KVM_IRQ_ROUTING_MSI ||
335 ue->type == KVM_IRQ_ROUTING_MSI ||
335 ue->u.irqchip.irqchip == ei->irqchip.irqchip) 336 ue->u.irqchip.irqchip == ei->irqchip.irqchip)
336 return r; 337 return r;
337 338