KVM: MIPS: Register die notifier prior to kvm_init()

Call kvm_init() only after _all_ setup is complete, as kvm_init() exposes
/dev/kvm to userspace and thus allows userspace to create VMs (and call
other ioctls).

Signed-off-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221130230934.1014142-24-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index 75681281e2dfe6352bdd9bcc80d5e9bf77efe401..ae7a24342fdf3e2358b1483c96ca578336c77502 100644 (file)
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -1640,16 +1640,17 @@ static int __init kvm_mips_init(void)
        if (ret)
                return ret;
 
-       ret = kvm_init(NULL, sizeof(struct kvm_vcpu), 0, THIS_MODULE);
-
-       if (ret)
-               return ret;
 
        if (boot_cpu_type() == CPU_LOONGSON64)
                kvm_priority_to_irq = kvm_loongson3_priority_to_irq;
 
        register_die_notifier(&kvm_mips_csr_die_notifier);
 
+       ret = kvm_init(NULL, sizeof(struct kvm_vcpu), 0, THIS_MODULE);
+       if (ret) {
+               unregister_die_notifier(&kvm_mips_csr_die_notifier);
+               return ret;
+       }
        return 0;
 }