]> err.no Git - linux-2.6/commitdiff
NFSv4: Fix a credential reference leak in nfs4_get_state_owner()
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 2 Jul 2007 14:24:56 +0000 (10:24 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 11 Jul 2007 03:40:38 +0000 (23:40 -0400)
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/nfs4state.c

index 5d7ffbfc3483085930dd69de4f90c4d0a9bae6f7..0030248d63ec9213dfdbc5920c32f0fc7c9e7386 100644 (file)
@@ -83,7 +83,7 @@ nfs4_client_grab_unused(struct nfs_client *clp, struct rpc_cred *cred)
        if (!list_empty(&clp->cl_unused)) {
                sp = list_entry(clp->cl_unused.next, struct nfs4_state_owner, so_list);
                atomic_inc(&sp->so_count);
-               sp->so_cred = cred;
+               sp->so_cred = get_rpccred(cred);
                list_move(&sp->so_list, &clp->cl_state_owners);
                clp->cl_nunused--;
        }
@@ -175,7 +175,6 @@ struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct
        struct nfs_client *clp = server->nfs_client;
        struct nfs4_state_owner *sp, *new;
 
-       get_rpccred(cred);
        new = nfs4_alloc_state_owner();
        spin_lock(&clp->cl_lock);
        sp = nfs4_find_state_owner(clp, cred);
@@ -185,7 +184,7 @@ struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct
                list_add(&new->so_list, &clp->cl_state_owners);
                new->so_client = clp;
                new->so_id = nfs4_alloc_lockowner_id(clp);
-               new->so_cred = cred;
+               new->so_cred = get_rpccred(cred);
                sp = new;
                new = NULL;
        }
@@ -193,7 +192,6 @@ struct nfs4_state_owner *nfs4_get_state_owner(struct nfs_server *server, struct
        kfree(new);
        if (sp != NULL)
                return sp;
-       put_rpccred(cred);
        return NULL;
 }