From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Yongjun Subject: [PATCH] KVM: only set kvm->arch.vioapic when success to init ioapic Date: Mon, 08 Feb 2010 17:36:45 +0800 Message-ID: <4B6FDB2D.9080707@cn.fujitsu.com> References: <4B6FD2DB.9040104@cn.fujitsu.com> <4B6FD377.205@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=GB2312 Content-Transfer-Encoding: 7bit Cc: Marcelo Tosatti To: kvm@vger.kernel.org Return-path: Received: from cn.fujitsu.com ([222.73.24.84]:49357 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752966Ab0BHJfi (ORCPT ); Mon, 8 Feb 2010 04:35:38 -0500 In-Reply-To: <4B6FD377.205@cn.fujitsu.com> Sender: kvm-owner@vger.kernel.org List-ID: kvm->arch.vioapic is always set either kvm_ioapic_init() is success or fail. If kvm_ioapic_init() is fail, the kvm->arch.vioapic may point a freed memory. Signed-off-by: Wei Yongjun --- virt/kvm/ioapic.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c index a2edfd1..e13f529 100644 --- a/virt/kvm/ioapic.c +++ b/virt/kvm/ioapic.c @@ -386,7 +386,6 @@ int kvm_ioapic_init(struct kvm *kvm) if (!ioapic) return -ENOMEM; mutex_init(&ioapic->lock); - kvm->arch.vioapic = ioapic; kvm_ioapic_reset(ioapic); kvm_iodevice_init(&ioapic->dev, &ioapic_mmio_ops); ioapic->kvm = kvm; @@ -395,6 +394,8 @@ int kvm_ioapic_init(struct kvm *kvm) mutex_unlock(&kvm->slots_lock); if (ret < 0) kfree(ioapic); + else + kvm->arch.vioapic = ioapic; return ret; } -- 1.6.3.3