]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
KVM: arm/arm64: Set dist->spis to NULL after kfree
authorEric Auger <eric.auger@redhat.com>
Tue, 22 May 2018 07:55:06 +0000 (09:55 +0200)
committerMarc Zyngier <marc.zyngier@arm.com>
Fri, 25 May 2018 11:29:26 +0000 (12:29 +0100)
in case kvm_vgic_map_resources() fails, typically if the vgic
distributor is not defined, __kvm_vgic_destroy will be called
several times. Indeed kvm_vgic_map_resources() is called on
first vcpu run. As a result dist->spis is freeed more than once
and on the second time it causes a "kernel BUG at mm/slub.c:3912!"

Set dist->spis to NULL to avoid the crash.

Fixes: ad275b8bb1e6 ("KVM: arm/arm64: vgic-new: vgic_init: implement
vgic_init")

Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Christoffer Dall <christoffer.dall@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
virt/kvm/arm/vgic/vgic-init.c

index e07156c303235e13dc00b31d39e38ff1d30d281d..9a5aed7eecfdb8be20247251e8931cbbe3a83e27 100644 (file)
@@ -308,6 +308,7 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm)
        dist->initialized = false;
 
        kfree(dist->spis);
+       dist->spis = NULL;
        dist->nr_spis = 0;
 
        if (vgic_supports_direct_msis(kvm))