diff options
| author | Christoffer Dall <cdall@linaro.org> | 2017-05-16 13:41:18 +0300 |
|---|---|---|
| committer | Christoffer Dall <cdall@linaro.org> | 2017-06-08 18:58:40 +0300 |
| commit | cb3f0ad881a6cee39c6a652b4aa4f12f341d98f0 (patch) | |
| tree | 60f64d85991db922057cdb48eb25969abda00b27 /virt/kvm/arm/arch_timer.c | |
| parent | abcb851daa617706e90ee7d39d4d9a74ac05f4b1 (diff) | |
| download | linux-cb3f0ad881a6cee39c6a652b4aa4f12f341d98f0.tar.xz | |
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/arch_timer.c')
| -rw-r--r-- | virt/kvm/arm/arch_timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index 07f6f9bfc1f2..8e89d63005c7 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -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); } } |