[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <50A8F108-8055-4115-B4EB-706D97736E65@ubuntu.com>
Date: Mon, 20 Feb 2012 23:30:11 -0500
From: Ben Collins <bcollins@...ntu.com>
To: Alexander Graf <agraf@...e.de>
Cc: kvm-ppc@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] KVM: PPC: check error return of kvmppc_core_vcpu_create first
The result of kvmppc_core_vcpu_create() was being manipulated before it was checked for IS_ERR(). Did not see the bug occur, but caught it when looking through the code.
Signed-off-by: Ben Collins <bcollins@...ntu.com>
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 607fbdf..8877614 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -278,10 +278,14 @@ void kvm_arch_flush_shadow(struct kvm *kvm)
struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, unsigned int id)
{
struct kvm_vcpu *vcpu;
+
vcpu = kvmppc_core_vcpu_create(kvm, id);
+ if (IS_ERR(vcpu))
+ return vcpu;
+
vcpu->arch.wqp = &vcpu->wq;
- if (!IS_ERR(vcpu))
- kvmppc_create_vcpu_debugfs(vcpu, id);
+ kvmppc_create_vcpu_debugfs(vcpu, id);
+
return vcpu;
}
--
Bluecherry: http://www.bluecherrydvr.com/
SwissDisk : http://www.swissdisk.com/
Ubuntu : http://www.ubuntu.com/
My Blog : http://ben-collins.blogspot.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists