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

Commit cb3f0ad8 authored by Christoffer Dall's avatar Christoffer Dall
Browse files

KVM: arm/arm64: Disallow userspace control of in-kernel IRQ lines 



When injecting an IRQ to the VGIC, you now have to present an owner
token for that IRQ line to show that you are the owner of that line.

IRQ lines driven from userspace or via an irqfd do not have an owner and
will simply pass a NULL pointer.

Also get rid of the unused kvm_vgic_inject_mapped_irq prototype.

Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent abcb851d

include/kvm/arm_vgic.h

+1 −3
Original line number Diff line number Diff line
@@ -300,9 +300,7 @@ int kvm_vgic_hyp_init(void); 
void kvm_vgic_init_cpu_hardware(void);



int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int intid,

			bool level);

int kvm_vgic_inject_mapped_irq(struct kvm *kvm, int cpuid, unsigned int intid,

			       bool level);

			bool level, void *owner);

int kvm_vgic_map_phys_irq(struct kvm_vcpu *vcpu, u32 virt_irq, u32 phys_irq);

int kvm_vgic_unmap_phys_irq(struct kvm_vcpu *vcpu, unsigned int virt_irq);

bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int virt_irq);

virt/kvm/arm/arch_timer.c

+2 −1
Original line number Diff line number Diff line
@@ -226,7 +226,8 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level, 
	if (likely(irqchip_in_kernel(vcpu->kvm))) {

		ret = kvm_vgic_inject_irq(vcpu->kvm, vcpu->vcpu_id,

					  timer_ctx->irq.irq,

					  timer_ctx->irq.level);

					  timer_ctx->irq.level,

					  timer_ctx);

		WARN_ON(ret);

	}

}

virt/kvm/arm/arm.c

+2 −2
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level, 
		if (irq_num < VGIC_NR_SGIS || irq_num >= VGIC_NR_PRIVATE_IRQS)

			return -EINVAL;



		return kvm_vgic_inject_irq(kvm, vcpu->vcpu_id, irq_num, level);

		return kvm_vgic_inject_irq(kvm, vcpu->vcpu_id, irq_num, level, NULL);

	case KVM_ARM_IRQ_TYPE_SPI:

		if (!irqchip_in_kernel(kvm))

			return -ENXIO;
@@ -840,7 +840,7 @@ int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level, 
		if (irq_num < VGIC_NR_PRIVATE_IRQS)

			return -EINVAL;



		return kvm_vgic_inject_irq(kvm, 0, irq_num, level);

		return kvm_vgic_inject_irq(kvm, 0, irq_num, level, NULL);

	}



	return -EINVAL;

virt/kvm/arm/pmu.c

+2 −1
Original line number Diff line number Diff line
@@ -215,7 +215,8 @@ static void kvm_pmu_check_overflow(struct kvm_vcpu *vcpu) 


	if (likely(irqchip_in_kernel(vcpu->kvm))) {

		int ret = kvm_vgic_inject_irq(vcpu->kvm, vcpu->vcpu_id,

					      pmu->irq_num, overflow);

					      pmu->irq_num, overflow,

					      &vcpu->arch.pmu);

		WARN_ON(ret);

	}

}

virt/kvm/arm/vgic/vgic-irqfd.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int vgic_irqfd_set_irq(struct kvm_kernel_irq_routing_entry *e, 


	if (!vgic_valid_spi(kvm, spi_id))

		return -EINVAL;

	return kvm_vgic_inject_irq(kvm, 0, spi_id, level);

	return kvm_vgic_inject_irq(kvm, 0, spi_id, level, NULL);

}



/**