[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] Fix memory leak in register save load due to
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 10/10] Fix memory leak in register save load due to xsave support |
Date: |
Wed, 20 Oct 2010 15:43:47 -0200 |
From: Avi Kivity <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
target-i386/kvm.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 1701cb9..2449c2f 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -660,7 +660,7 @@ static int kvm_put_fpu(CPUState *env)
static int kvm_put_xsave(CPUState *env)
{
#ifdef KVM_CAP_XSAVE
- int i;
+ int i, r;
struct kvm_xsave* xsave;
uint16_t cwd, swd, twd, fop;
@@ -685,7 +685,9 @@ static int kvm_put_xsave(CPUState *env)
*(uint64_t *)&xsave->region[XSAVE_XSTATE_BV] = env->xstate_bv;
memcpy(&xsave->region[XSAVE_YMMH_SPACE], env->ymmh_regs,
sizeof env->ymmh_regs);
- return kvm_vcpu_ioctl(env, KVM_SET_XSAVE, xsave);
+ r = kvm_vcpu_ioctl(env, KVM_SET_XSAVE, xsave);
+ qemu_free(xsave);
+ return r;
#else
return kvm_put_fpu(env);
#endif
@@ -850,8 +852,10 @@ static int kvm_get_xsave(CPUState *env)
xsave = qemu_memalign(4096, sizeof(struct kvm_xsave));
ret = kvm_vcpu_ioctl(env, KVM_GET_XSAVE, xsave);
- if (ret < 0)
+ if (ret < 0) {
+ qemu_free(xsave);
return ret;
+ }
cwd = (uint16_t)xsave->region[0];
swd = (uint16_t)(xsave->region[0] >> 16);
@@ -870,6 +874,7 @@ static int kvm_get_xsave(CPUState *env)
env->xstate_bv = *(uint64_t *)&xsave->region[XSAVE_XSTATE_BV];
memcpy(env->ymmh_regs, &xsave->region[XSAVE_YMMH_SPACE],
sizeof env->ymmh_regs);
+ qemu_free(xsave);
return 0;
#else
return kvm_get_fpu(env);
--
1.7.2.1
- [Qemu-devel] [PATCH 07/10] Export qemu_ram_addr_from_host, (continued)
- [Qemu-devel] [PATCH 07/10] Export qemu_ram_addr_from_host, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 05/10] Expose thread_id in info cpus, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 02/10] Add svm cpuid features, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 03/10] signalfd compatibility, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 08/10] Add RAM -> physical addr mapping in MCE simulation, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 04/10] iothread: use signalfd, Marcelo Tosatti, 2010/10/19
- [Qemu-devel] [PATCH 01/10] Set cpuid definition to 0 before initializing it, Marcelo Tosatti, 2010/10/19
- Re: [Qemu-devel] [PATCH 00/10] [PULL] qemu-kvm.git uq/master queue, Anthony Liguori, 2010/10/19
- [Qemu-devel] [PATCH 00/10] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2010/10/20
- [Qemu-devel] [PATCH 06/10] Export qemu_ram_addr_from_host, Marcelo Tosatti, 2010/10/20
- [Qemu-devel] [PATCH 10/10] Fix memory leak in register save load due to xsave support,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 01/10] Set cpuid definition to 0 before initializing it, Marcelo Tosatti, 2010/10/20
- [Qemu-devel] [PATCH 04/10] iothread: use signalfd, Marcelo Tosatti, 2010/10/20
- [Qemu-devel] [PATCH 03/10] signalfd compatibility, Marcelo Tosatti, 2010/10/20
- [Qemu-devel] [PATCH 07/10] Add RAM -> physical addr mapping in MCE simulation, Marcelo Tosatti, 2010/10/20
- [Qemu-devel] [PATCH 05/10] kvm: x86: add mce support, Marcelo Tosatti, 2010/10/20
- [Qemu-devel] [PATCH 02/10] Add svm cpuid features, Marcelo Tosatti, 2010/10/20
- [Qemu-devel] [PATCH 08/10] MCE: Relay UCR MCE to guest, Marcelo Tosatti, 2010/10/20