KVM: Don't free new memslot if allocation of said memslot fails

Sean Christopherson · bonzini · commit 13f678894bd0 · 2020-03-16T17:57:15.000+01:00
The two implementations of kvm_arch_create_memslot() in x86 and PPC are
both good citizens and free up all local resources if creation fails.
Return immediately (via a superfluous goto) instead of calling
kvm_free_memslot().

Note, the call to kvm_free_memslot() is effectively an expensive nop in
this case as there are no resources to be freed.

No functional change intended.

Acked-by: Christoffer Dall &lt;christoffer.dall@arm.com&gt;
Reviewed-by: Peter Xu &lt;peterx@redhat.com&gt;
Signed-off-by: Sean Christopherson &lt;sean.j.christopherson@intel.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
@@ -1089,7 +1089,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
 		new.userspace_addr = mem->userspace_addr;
 
 		if (kvm_arch_create_memslot(kvm, &new, npages))
-			goto out_free;
+			goto out;
 	}
 
 	/* Allocate page dirty bitmap if needed */

Original file line number	Diff line number	Diff line change
`@@ -1089,7 +1089,7 @@ int __kvm_set_memory_region(struct kvm *kvm,`
`1089`	`1089`	`new.userspace_addr = mem->userspace_addr;`
`1090`	`1090`
`1091`	`1091`	`if (kvm_arch_create_memslot(kvm, &new, npages))`
`1092`		`- goto out_free;`
	`1092`	`+ goto out;`
`1093`	`1093`	`}`
`1094`	`1094`
`1095`	`1095`	`/* Allocate page dirty bitmap if needed */`