KVM: arm64: Free hypervisor allocations if vector slot init fails

Teardown hypervisor mode if vector slot setup fails in order to avoid
leaking any allocations done by init_hyp_mode().

Fixes: b881cdce77b4 ("KVM: arm64: Allocate hyp vectors statically")
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20221130230934.1014142-18-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index b572c78f3c2392c1d0ab0ad2b4311f416d3a7b6c..baf32c291b98ec39c88d23ceb7b09b337b06ff72 100644 (file)
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -2249,18 +2249,18 @@ int kvm_arch_init(void *opaque)
        err = kvm_init_vector_slots();
        if (err) {
                kvm_err("Cannot initialise vector slots\n");
-               goto out_err;
+               goto out_hyp;
        }
 
        err = init_subsystems();
        if (err)
-               goto out_hyp;
+               goto out_subs;
 
        if (!in_hyp_mode) {
                err = finalize_hyp_mode();
                if (err) {
                        kvm_err("Failed to finalize Hyp protection\n");
-                       goto out_hyp;
+                       goto out_subs;
                }
        }
 
@@ -2274,8 +2274,9 @@ int kvm_arch_init(void *opaque)
 
        return 0;
 
-out_hyp:
+out_subs:
        hyp_cpu_pm_exit();
+out_hyp:
        if (!in_hyp_mode)
                teardown_hyp_mode();
 out_err: