Patchwork KVM: PPC: Book3S PR: return appropriate error when allocation fails

login
register
mail settings
Submitter Thadeu Lima de Souza Cascardo
Date July 17, 2013, 3:10 p.m.
Message ID <1374073829-28246-1-git-send-email-cascardo@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/259708/
State Accepted, archived
Commit e0e13614626bfb5a88678fd951d728ed40e3cbf6
Headers show

Comments

Thadeu Lima de Souza Cascardo - July 17, 2013, 3:10 p.m.
err was overwritten by a previous function call, and checked to be 0. If
the following page allocation fails, 0 is going to be returned instead
of -ENOMEM.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
---
 arch/powerpc/kvm/book3s_pr.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
Alexander Graf - Aug. 28, 2013, 2:26 p.m.
On 17.07.2013, at 17:10, Thadeu Lima de Souza Cascardo wrote:

> err was overwritten by a previous function call, and checked to be 0. If
> the following page allocation fails, 0 is going to be returned instead
> of -ENOMEM.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>

Thanks, applied to kvm-ppc-queue.


Alex

Patch

diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index 19498a5..c6e13d9 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -1047,11 +1047,12 @@  struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
 	if (err)
 		goto free_shadow_vcpu;
 
+	err = -ENOMEM;
 	p = __get_free_page(GFP_KERNEL|__GFP_ZERO);
-	/* the real shared page fills the last 4k of our page */
-	vcpu->arch.shared = (void*)(p + PAGE_SIZE - 4096);
 	if (!p)
 		goto uninit_vcpu;
+	/* the real shared page fills the last 4k of our page */
+	vcpu->arch.shared = (void *)(p + PAGE_SIZE - 4096);
 
 #ifdef CONFIG_PPC_BOOK3S_64
 	/* default to book3s_64 (970fx) */