Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5698e918 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents f80c43ef f2ebd422

virt/kvm/irq_comm.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -332,6 +332,7 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt, 
	 */

	 */

	hlist_for_each_entry(ei, n, &rt->map[ue->gsi], link)

	hlist_for_each_entry(ei, n, &rt->map[ue->gsi], link)

		if (ei->type == KVM_IRQ_ROUTING_MSI ||

		if (ei->type == KVM_IRQ_ROUTING_MSI ||

		    ue->type == KVM_IRQ_ROUTING_MSI ||

		    ue->u.irqchip.irqchip == ei->irqchip.irqchip)

		    ue->u.irqchip.irqchip == ei->irqchip.irqchip)

			return r;

			return r;