From mboxrd@z Thu Jan 1 00:00:00 1970 From: walter harms Subject: Re: [patch] KVM: return an error code in kvm_vm_ioctl_register_coalesced_mmio() Date: Wed, 29 Jan 2014 14:57:21 +0100 Message-ID: <52E908C1.8020306@bfs.de> References: <20140129131639.GB10678@elgon.mountain> Reply-To: wharms@bfs.de Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Gleb Natapov , Paolo Bonzini , kvm@vger.kernel.org, kernel-janitors@vger.kernel.org To: Dan Carpenter Return-path: In-Reply-To: <20140129131639.GB10678@elgon.mountain> Sender: kernel-janitors-owner@vger.kernel.org List-Id: kvm.vger.kernel.org Am 29.01.2014 14:16, schrieb Dan Carpenter: > If kvm_io_bus_register_dev() fails then it returns success but it should > return an error code. > > I also did a little cleanup like removing an impossible NULL test. > > Fixes: 2b3c246a682c ('KVM: Make coalesced mmio use a device per zone') > Signed-off-by: Dan Carpenter > > diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c > index 88b2fe3ddf42..00d86427af0f 100644 > --- a/virt/kvm/coalesced_mmio.c > +++ b/virt/kvm/coalesced_mmio.c > @@ -154,17 +154,13 @@ int kvm_vm_ioctl_register_coalesced_mmio(struct kvm *kvm, > list_add_tail(&dev->list, &kvm->coalesced_zones); > mutex_unlock(&kvm->slots_lock); > > - return ret; > + return 0; > > out_free_dev: > mutex_unlock(&kvm->slots_lock); > - > kfree(dev); > > - if (dev == NULL) > - return -ENXIO; > - > - return 0; > + return ret; > } > > int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm, I did not see the rest of the code, be careful .. You can get rid of the return 0 by protecting the free(dev) like if (ret != 0) kfree(dev); that will make the mutex_unlock(&kvm->slots_lock); return 0; obsolet. (simply set ret=0 if needed). re, wh > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >