Message ID | 4F9944F3.9010507@canonical.com |
---|---|
State | New |
Headers | show |
On 26.04.2012 14:52, Tim Gardner wrote: > So this patch causes a compile error. I've attached the correction. I > suggest that it just be squashed into the original commit. > > rtg > > > > Maybe we want to pick up the patch that introduced it: commit d780592b99d7d8a5ff905f6bacca519d4a342c76 Author: Jan Kiszka <jan.kiszka@siemens.com> Date: Mon May 23 10:33:05 2011 +0200 KVM: Clean up error handling during VCPU creation Not sure all the jumps to vcpu_destroy before would otherwise do the right thing...
From df5a957f09269380e0d86fd7f718dcfabb9d426d Mon Sep 17 00:00:00 2001 From: Tim Gardner <tim.gardner@canonical.com> Date: Thu, 26 Apr 2012 06:50:41 -0600 Subject: [PATCH] UBUNTU: Fix compile error in CVE-2012-1601 Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- virt/kvm/kvm_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 37f259e..dadabb7 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1654,8 +1654,9 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) mutex_unlock(&kvm->lock); return r; -vcpu_destroy: +unlock_vcpu_destroy: mutex_unlock(&kvm->lock); +vcpu_destroy: kvm_arch_vcpu_destroy(vcpu); return r; } -- 1.7.9.5