We increment the reference count for KVM-HV/PR before the call to
kvmppc_core_init_vm. If that function fails we need to decrement the
refcount.

Also remove the check on kvm_ops->owner because try_module_get can
handle a NULL module.

Signed-off-by: Fabiano Rosas <faro...@linux.ibm.com>
Reviewed-by: Nicholas Piggin <npig...@gmail.com>
---
 arch/powerpc/kvm/powerpc.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 2ad0ccd202d5..a6d6d452243f 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -431,6 +431,8 @@ int kvm_arch_check_processor_compat(void *opaque)
 int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
 {
        struct kvmppc_ops *kvm_ops = NULL;
+       int r;
+
        /*
         * if we have both HV and PR enabled, default is HV
         */
@@ -452,11 +454,14 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
        } else
                goto err_out;
 
-       if (kvm_ops->owner && !try_module_get(kvm_ops->owner))
+       if (!try_module_get(kvm_ops->owner))
                return -ENOENT;
 
        kvm->arch.kvm_ops = kvm_ops;
-       return kvmppc_core_init_vm(kvm);
+       r = kvmppc_core_init_vm(kvm);
+       if (r)
+               module_put(kvm_ops->owner);
+       return r;
 err_out:
        return -EINVAL;
 }
-- 
2.34.1

Reply via email to