staging: lustre: ldlm: free resource when ldlm_lock_create() fails.
authorNeilBrown <neilb@suse.com>
Thu, 29 Mar 2018 04:26:48 +0000 (15:26 +1100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Aug 2018 05:50:39 +0000 (07:50 +0200)
[ Upstream commit d8caf662b4aeeb2ac83ac0b22e40db88e9360c77 ]

ldlm_lock_create() gets a resource, but don't put it on
all failure paths. It should.

Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c

index b5d84f3f6071913572606a2e8306e0772804b388..11e01c48f51ac59073e5ad090c9562daff5358e7 100644 (file)
@@ -1571,8 +1571,10 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns,
                return ERR_CAST(res);
 
        lock = ldlm_lock_new(res);
-       if (!lock)
+       if (!lock) {
+               ldlm_resource_putref(res);
                return ERR_PTR(-ENOMEM);
+       }
 
        lock->l_req_mode = mode;
        lock->l_ast_data = data;
@@ -1615,6 +1617,8 @@ out:
        return ERR_PTR(rc);
 }
 
+
+
 /**
  * Enqueue (request) a lock.
  * On the client this is called from ldlm_cli_enqueue_fini