diff options
| author | Christoffer Dall | 2017-05-16 12:41:18 +0200 |
|---|---|---|
| committer | Christoffer Dall | 2017-06-08 17:58:40 +0200 |
| commit | cb3f0ad881a6cee39c6a652b4aa4f12f341d98f0 (patch) | |
| tree | 60f64d85991db922057cdb48eb25969abda00b27 /virt/kvm/arm/arm.c | |
| parent | KVM: arm/arm64: Check if irq lines to the GIC are already used (diff) | |
| download | kernel-qcow2-linux-cb3f0ad881a6cee39c6a652b4aa4f12f341d98f0.tar.gz kernel-qcow2-linux-cb3f0ad881a6cee39c6a652b4aa4f12f341d98f0.tar.xz kernel-qcow2-linux-cb3f0ad881a6cee39c6a652b4aa4f12f341d98f0.zip | |
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: Christoffer Dall <cdall@linaro.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'virt/kvm/arm/arm.c')
| -rw-r--r-- | virt/kvm/arm/arm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 72816d3f23a7..a265acc53e39 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -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; |