1 files changed, 11 insertions, 7 deletions

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index a33b627cbef4..2f7b867161d2 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -660,14 +660,16 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
 {
         struct gss_auth *gss_auth;
         struct rpc_auth * auth;
+        int err = -ENOMEM; /* XXX? */
 
         dprintk("RPC:      creating GSS authenticator for client %p\n",clnt);
 
         if (!try_module_get(THIS_MODULE))
-                return NULL;
+                return ERR_PTR(err);
         if (!(gss_auth = kmalloc(sizeof(*gss_auth), GFP_KERNEL)))
                 goto out_dec;
         gss_auth->client = clnt;
+        err = -EINVAL;
         gss_auth->mech = gss_mech_get_by_pseudoflavor(flavor);
         if (!gss_auth->mech) {
                 printk(KERN_WARNING "%s: Pseudoflavor %d not found!",
@@ -675,9 +677,8 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
                 goto err_free;
         }
         gss_auth->service = gss_pseudoflavor_to_service(gss_auth->mech, flavor);
-        /* FIXME: Will go away once privacy support is merged in */
-        if (gss_auth->service == RPC_GSS_SVC_PRIVACY)
-                gss_auth->service = RPC_GSS_SVC_INTEGRITY;
+        if (gss_auth->service == 0)
+                goto err_put_mech;
         INIT_LIST_HEAD(&gss_auth->upcalls);
         spin_lock_init(&gss_auth->lock);
         auth = &gss_auth->rpc_auth;
@@ -687,15 +688,18 @@ gss_create(struct rpc_clnt *clnt, rpc_authflavor_t flavor)
         auth->au_flavor = flavor;
         atomic_set(&auth->au_count, 1);
 
-        if (rpcauth_init_credcache(auth, GSS_CRED_EXPIRE) < 0)
+        err = rpcauth_init_credcache(auth, GSS_CRED_EXPIRE);
+        if (err)
                 goto err_put_mech;
 
         snprintf(gss_auth->path, sizeof(gss_auth->path), "%s/%s",
                         clnt->cl_pathname,
                         gss_auth->mech->gm_name);
         gss_auth->dentry = rpc_mkpipe(gss_auth->path, clnt, &gss_upcall_ops, RPC_PIPE_WAIT_FOR_OPEN);
-        if (IS_ERR(gss_auth->dentry))
+        if (IS_ERR(gss_auth->dentry)) {
+                err = PTR_ERR(gss_auth->dentry);
                 goto err_put_mech;
+        }
 
         return auth;
 err_put_mech:
@@ -704,7 +708,7 @@ err_free:
         kfree(gss_auth);
 out_dec:
         module_put(THIS_MODULE);
-        return NULL;
+        return ERR_PTR(err);
 }
 
 static void