diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-11-16 18:58:19 +0100 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2017-11-29 16:46:16 +0100 |
| commit | a05d1c0d03fd60ed487991e73850421e735c0135 (patch) | |
| tree | d655239c4520daf82da3e90abfaa2746154ccf9b /virt/kvm | |
| parent | KVM: arm/arm64: vgic-its: Check result of allocation before use (diff) | |
| download | linux-a05d1c0d03fd60ed487991e73850421e735c0135.tar.xz linux-a05d1c0d03fd60ed487991e73850421e735c0135.zip | |
KVM: arm/arm64: vgic-v4: Only perform an unmap for valid vLPIs
Before performing an unmap, let's check that what we have was
really mapped the first place.
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-v4.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/virt/kvm/arm/vgic/vgic-v4.c b/virt/kvm/arm/vgic/vgic-v4.c index 53c324aa44ef..4a37292855bc 100644 --- a/virt/kvm/arm/vgic/vgic-v4.c +++ b/virt/kvm/arm/vgic/vgic-v4.c @@ -337,8 +337,10 @@ int kvm_vgic_v4_unset_forwarding(struct kvm *kvm, int virq, goto out; WARN_ON(!(irq->hw && irq->host_irq == virq)); - irq->hw = false; - ret = its_unmap_vlpi(virq); + if (irq->hw) { + irq->hw = false; + ret = its_unmap_vlpi(virq); + } out: mutex_unlock(&its->its_lock); |