[FIX PATCH] KVM: Use kvm_kvfree() to free memory allocated by kvm_kvzalloc()

[FIX PATCH] KVM: Use kvm_kvfree() to free memory allocated by kvm_kvzalloc()

[Takuya Yoshikawa]

From: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>

The following commit did not care about the error handling path:

  commit c1a7b32a14138f908df52d7c53b5ce3415ec6b50
  KVM: Avoid wasting pages for small lpage_info arrays

If memory allocation fails, vfree() will be called with the address
returned by kzalloc().  This patch fixes this issue.

Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
---
 arch/x86/kvm/x86.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index a01a424..6ed5983 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -6350,7 +6350,7 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
 
 out_free:
 	for (i = 0; i < KVM_NR_PAGE_SIZES - 1; ++i) {
-		vfree(slot->arch.lpage_info[i]);
+		kvm_kvfree(slot->arch.lpage_info[i]);
 		slot->arch.lpage_info[i] = NULL;
 	}
 	return -ENOMEM;
-- 
1.7.5.4

Re: [FIX PATCH] KVM: Use kvm_kvfree() to free memory allocated by kvm_kvzalloc()

[Avi Kivity]

On 06/19/2012 04:04 PM, Takuya Yoshikawa wrote:
> From: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
> 
> The following commit did not care about the error handling path:
> 
>   commit c1a7b32a14138f908df52d7c53b5ce3415ec6b50
>   KVM: Avoid wasting pages for small lpage_info arrays
> 
> If memory allocation fails, vfree() will be called with the address
> returned by kzalloc().  This patch fixes this issue.


Thanks, applied to next.


-- 
error compiling committee.c: too many arguments to function