lkml.org 
[lkml]   [2011]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[107/262] KVM: s390: check cpu_id prior to using it
    3.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Carsten Otte <cotte@de.ibm.com>

    commit 4d47555a80495657161a7e71ec3014ff2021e450 upstream.

    We use the cpu id provided by userspace as array index here. Thus we
    clearly need to check it first. Ooops.

    Signed-off-by: Carsten Otte <cotte@de.ibm.com>
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/s390/kvm/kvm-s390.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    --- a/arch/s390/kvm/kvm-s390.c
    +++ b/arch/s390/kvm/kvm-s390.c
    @@ -301,11 +301,17 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu
    struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
    unsigned int id)
    {
    - struct kvm_vcpu *vcpu = kzalloc(sizeof(struct kvm_vcpu), GFP_KERNEL);
    - int rc = -ENOMEM;
    + struct kvm_vcpu *vcpu;
    + int rc = -EINVAL;

    + if (id >= KVM_MAX_VCPUS)
    + goto out;
    +
    + rc = -ENOMEM;
    +
    + vcpu = kzalloc(sizeof(struct kvm_vcpu), GFP_KERNEL);
    if (!vcpu)
    - goto out_nomem;
    + goto out;

    vcpu->arch.sie_block = (struct kvm_s390_sie_block *)
    get_zeroed_page(GFP_KERNEL);
    @@ -341,7 +347,7 @@ out_free_sie_block:
    free_page((unsigned long)(vcpu->arch.sie_block));
    out_free_cpu:
    kfree(vcpu);
    -out_nomem:
    +out:
    return ERR_PTR(rc);
    }




    \
     
     \ /
      Last update: 2011-11-10 04:29    [W:4.069 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site