lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 074/330] KVM: arm/arm64: vgic: Fix potential double free dist->spis in __kvm_vgic_destroy()
    Date
    From: Miaohe Lin <linmiaohe@huawei.com>

    [ Upstream commit 0bda9498dd45280e334bfe88b815ebf519602cc3 ]

    In kvm_vgic_dist_init() called from kvm_vgic_map_resources(), if
    dist->vgic_model is invalid, dist->spis will be freed without set
    dist->spis = NULL. And in vgicv2 resources clean up path,
    __kvm_vgic_destroy() will be called to free allocated resources.
    And dist->spis will be freed again in clean up chain because we
    forget to set dist->spis = NULL in kvm_vgic_dist_init() failed
    path. So double free would happen.

    Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
    Signed-off-by: Marc Zyngier <maz@kernel.org>
    Reviewed-by: Eric Auger <eric.auger@redhat.com>
    Link: https://lore.kernel.org/r/1574923128-19956-1-git-send-email-linmiaohe@huawei.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    virt/kvm/arm/vgic/vgic-init.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/virt/kvm/arm/vgic/vgic-init.c b/virt/kvm/arm/vgic/vgic-init.c
    index 6f50c429196de..6d85c6d894c39 100644
    --- a/virt/kvm/arm/vgic/vgic-init.c
    +++ b/virt/kvm/arm/vgic/vgic-init.c
    @@ -177,6 +177,7 @@ static int kvm_vgic_dist_init(struct kvm *kvm, unsigned int nr_spis)
    break;
    default:
    kfree(dist->spis);
    + dist->spis = NULL;
    return -EINVAL;
    }
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-09-18 04:03    [W:4.133 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site