lkml.org 
[lkml]   [2016]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 062/126] MIPS: KVM: Uninit VCPU in vcpu_create error path
    Date
    3.16.7-ckt22 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: James Hogan <james.hogan@imgtec.com>

    commit 585bb8f9a5e592f2ce7abbe5ed3112d5438d2754 upstream.

    If either of the memory allocations in kvm_arch_vcpu_create() fail, the
    vcpu which has been allocated and kvm_vcpu_init'd doesn't get uninit'd
    in the error handling path. Add a call to kvm_vcpu_uninit() to fix this.

    Fixes: 669e846e6c4e ("KVM/MIPS32: MIPS arch specific APIs for KVM")
    Signed-off-by: James Hogan <james.hogan@imgtec.com>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Gleb Natapov <gleb@kernel.org>
    Cc: linux-mips@linux-mips.org
    Cc: kvm@vger.kernel.org
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    [ luis: backported to 3.16:
    - file rename: mips.c -> kvm_mips.c ]
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    arch/mips/kvm/kvm_mips.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c
    index cc721a3c8996..2c81c2c9e8dc 100644
    --- a/arch/mips/kvm/kvm_mips.c
    +++ b/arch/mips/kvm/kvm_mips.c
    @@ -307,7 +307,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)

    if (!gebase) {
    err = -ENOMEM;
    - goto out_free_cpu;
    + goto out_uninit_cpu;
    }
    kvm_debug("Allocated %d bytes for KVM Exception Handlers @ %p\n",
    ALIGN(size, PAGE_SIZE), gebase);
    @@ -368,6 +368,9 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
    out_free_gebase:
    kfree(gebase);

    +out_uninit_cpu:
    + kvm_vcpu_uninit(vcpu);
    +
    out_free_cpu:
    kfree(vcpu);


    \
     
     \ /
      Last update: 2016-01-06 12:41    [W:4.017 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site