diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2017-11-10 09:16:23 +0100 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2017-11-10 09:55:59 +0100 |
| commit | 3d1ad640f8c94a9ae9c7c8bbb311614bc0332a7e (patch) | |
| tree | 7ca1847dee2a945c4ad3a7e8935cdf8fd60b344b /virt/kvm/arm/vgic/vgic-init.c | |
| parent | ed8703a506a8241f921feb63a656d0ff5a090895 (diff) | |
| download | lwn-3d1ad640f8c94a9ae9c7c8bbb311614bc0332a7e.tar.gz lwn-3d1ad640f8c94a9ae9c7c8bbb311614bc0332a7e.zip | |
KVM: arm/arm64: Fix GICv4 ITS initialization issues
We should only try to initialize GICv4 data structures on a GICv4
capable system. Move the vgic_supports_direct_msis() check inito
vgic_v4_init() so that any KVM VGIC initialization path does not fail
on non-GICv4 systems.
Also be slightly more strict in the checking of the return value in
vgic_its_create, and only error out on negative return values from the
vgic_v4_init() function. This is important because the kvm device code
only treats negative values as errors and only cleans up in this case.
Errornously treating a positive return value as an error from the
vgic_v4_init() function can lead to NULL pointer dereferences, as has
recently been observed.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-init.c')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-init.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c index 40be908da238..62310122ee78 100644 --- a/virt/kvm/arm/vgic/vgic-init.c +++ b/virt/kvm/arm/vgic/vgic-init.c @@ -285,11 +285,9 @@ int vgic_init(struct kvm *kvm) if (ret) goto out; - if (vgic_supports_direct_msis(kvm)) { - ret = vgic_v4_init(kvm); - if (ret) - goto out; - } + ret = vgic_v4_init(kvm); + if (ret) + goto out; kvm_for_each_vcpu(i, vcpu, kvm) kvm_vgic_vcpu_enable(vcpu); |