From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Yongjun Subject: [PATCH 4/4] KVM: ia64: destroy ioapic device if fail to setup default irq routing Date: Tue, 09 Feb 2010 10:41:56 +0800 Message-ID: <4B70CB74.1060308@cn.fujitsu.com> References: <4B70C8ED.4000205@cn.fujitsu.com> <4B70C95F.7070508@cn.fujitsu.com> <4B70CADF.7070204@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]:50547 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752857Ab0BICkp (ORCPT ); Mon, 8 Feb 2010 21:40:45 -0500 In-Reply-To: <4B70CADF.7070204@cn.fujitsu.com> Sender: kvm-owner@vger.kernel.org List-ID: If KVM_CREATE_IRQCHIP fail due to kvm_setup_default_irq_routing(), ioapic device is not destroyed and kvm->arch.vioapic is not set to NULL, this may cause KVM_GET_IRQCHIP and KVM_SET_IRQCHIP access to unexcepted memory. Signed-off-by: Wei Yongjun --- arch/ia64/kvm/kvm-ia64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 0618898..26e0e08 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -968,7 +968,7 @@ long kvm_arch_vm_ioctl(struct file *filp, goto out; r = kvm_setup_default_irq_routing(kvm); if (r) { - kfree(kvm->arch.vioapic); + kvm_ioapic_destroy(kvm); goto out; } break; -- 1.6.3.3