diff options
| author | Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp> | 2012-06-19 22:04:56 +0900 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-06-19 16:10:25 +0300 |
| commit | 9e40b67bf2bfaa40b28354c501a72fd001a1397a (patch) | |
| tree | ac0cb17a5a5d869d01a3288ff6ab4003628a7adc /arch/x86/kvm/x86.c | |
| parent | a1e4ccb990447df0fe83d164d9a7bc2e6c4b7db7 (diff) | |
| download | linux-9e40b67bf2bfaa40b28354c501a72fd001a1397a.tar.gz linux-9e40b67bf2bfaa40b28354c501a72fd001a1397a.tar.bz2 linux-9e40b67bf2bfaa40b28354c501a72fd001a1397a.zip | |
KVM: Use kvm_kvfree() to free memory allocated by kvm_kvzalloc()
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>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | 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 a01a4241bc6b..6ed5983f78ff 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; |