[PATCH 3/5] KVM: PPC: Book3S HV: Free allocated memory if module init fails

[Fabiano Rosas]

The module's exit function is not called when the init fails, we need
to do cleanup before returning.

Signed-off-by: Fabiano Rosas <faro...@linux.ibm.com>
---
 arch/powerpc/kvm/book3s_hv.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index fe20074faa61..a7b82eb438f5 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -5963,7 +5963,7 @@ static int kvmppc_book3s_init_hv(void)
 
        r = kvm_init_subcore_bitmap();
        if (r)
-               return r;
+               goto err;
 
        /*
         * We need a way of accessing the XICS interrupt controller,
@@ -5978,7 +5978,8 @@ static int kvmppc_book3s_init_hv(void)
                np = of_find_compatible_node(NULL, NULL, "ibm,opal-intc");
                if (!np) {
                        pr_err("KVM-HV: Cannot determine method for accessing 
XICS\n");
-                       return -ENODEV;
+                       r = -ENODEV;
+                       goto err;
                }
                /* presence of intc confirmed - node can be dropped again */
                of_node_put(np);
@@ -5991,12 +5992,12 @@ static int kvmppc_book3s_init_hv(void)
 
        r = kvmppc_mmu_hv_init();
        if (r)
-               return r;
+               goto err;
 
        if (kvmppc_radix_possible()) {
                r = kvmppc_radix_init();
                if (r)
-                       return r;
+                       goto err;
        }
 
        r = kvmppc_uvmem_init();
@@ -6009,6 +6010,12 @@ static int kvmppc_book3s_init_hv(void)
        kvmppc_hv_ops = &kvm_ops_hv;
 
        return 0;
+
+err:
+       kvmhv_nested_exit();
+       kvmppc_radix_exit();
+
+       return r;
 }
 
 static void kvmppc_book3s_exit_hv(void)
-- 
2.29.2