Commit 39133352 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull kvm fixes from Paolo Bonzini:
 "Two fixes for ARM ITS emulation. Unmapped interrupts were used instead
  of ignored, causing NULL pointer dereferences"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: arm64: vgic-its: Test for valid IRQ in MOVALL handler
  KVM: arm64: vgic-its: Test for valid IRQ in its_sync_lpi_pending_table()
parents 8da8d884 c48617fb

arch/arm64/kvm/vgic/vgic-its.c

+5 −0
Original line number Diff line number Diff line
@@ -468,6 +468,9 @@ static int its_sync_lpi_pending_table(struct kvm_vcpu *vcpu) 
		}



		irq = vgic_get_irq(vcpu->kvm, NULL, intids[i]);

		if (!irq)

			continue;



		raw_spin_lock_irqsave(&irq->irq_lock, flags);

		irq->pending_latch = pendmask & (1U << bit_nr);

		vgic_queue_irq_unlock(vcpu->kvm, irq, flags);
@@ -1432,6 +1435,8 @@ static int vgic_its_cmd_handle_movall(struct kvm *kvm, struct vgic_its *its, 


	for (i = 0; i < irq_count; i++) {

		irq = vgic_get_irq(kvm, NULL, intids[i]);

		if (!irq)

			continue;



		update_affinity(irq, vcpu2);