KVM: PPC: Book 3S: Fix error return in kvm_vm_ioctl_create_spapr_tce()

Wei Yongjun · paulusmack · commit 5982f0849e08 · 2017-02-09T22:06:28.000+11:00
Fix to return error code -ENOMEM from the memory alloc error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun &lt;weiyongjun1@huawei.com&gt;
Signed-off-by: Paul Mackerras &lt;paulus@ozlabs.org&gt;
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c
@@ -171,6 +171,7 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,
 		goto fail;
 	}
 
+	ret = -ENOMEM;
 	stt = kzalloc(sizeof(*stt) + npages * sizeof(struct page *),
 		      GFP_KERNEL);
 	if (!stt)

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,`
`171`	`171`	`goto fail;`
`172`	`172`	`}`
`173`	`173`
	`174`	`+ ret = -ENOMEM;`
`174`	`175`	`stt = kzalloc(sizeof(stt) + npages sizeof(struct page *),`
`175`	`176`	`GFP_KERNEL);`
`176`	`177`	`if (!stt)`