From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rusty Russell Subject: [PATCH] Use kmem_cache_free for kmem_cache_zalloc'ed objects Date: Wed, 01 Aug 2007 14:46:11 +1000 Message-ID: <1185943571.6131.127.camel@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-devel Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org We use kfree in svm.c and vmx.c, and this works, but it could break at any time. kfree() is supposed to match up with kmalloc(). Signed-off-by: Rusty Russell diff -r 7e054bfac61d drivers/kvm/svm.c --- a/drivers/kvm/svm.c Wed Aug 01 10:42:06 2007 +1000 +++ b/drivers/kvm/svm.c Wed Aug 01 14:41:22 2007 +1000 @@ -592,7 +592,7 @@ uninit: uninit: kvm_vcpu_uninit(&svm->vcpu); free_svm: - kfree(svm); + kmem_cache_free(kvm_vcpu_cache, svm); out: return ERR_PTR(err); } @@ -603,7 +603,7 @@ static void svm_free_vcpu(struct kvm_vcp __free_page(pfn_to_page(svm->vmcb_pa >> PAGE_SHIFT)); kvm_vcpu_uninit(vcpu); - kfree(svm); + kmem_cache_free(kvm_vcpu_cache, svm); } static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) diff -r 7e054bfac61d drivers/kvm/vmx.c --- a/drivers/kvm/vmx.c Wed Aug 01 10:42:06 2007 +1000 +++ b/drivers/kvm/vmx.c Wed Aug 01 14:41:41 2007 +1000 @@ -2344,7 +2344,7 @@ static void vmx_free_vcpu(struct kvm_vcp kfree(vmx->host_msrs); kfree(vmx->guest_msrs); kvm_vcpu_uninit(vcpu); - kfree(vmx); + kmem_cache_free(kvm_vcpu_cache, vmx); } static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) @@ -2395,7 +2395,7 @@ uninit_vcpu: uninit_vcpu: kvm_vcpu_uninit(&vmx->vcpu); free_vcpu: - kfree(vmx); + kmem_cache_free(kvm_vcpu_cache, vmx); return ERR_PTR(err); } ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/