Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux

Pull the rest of the nfsd commits from Bruce Fields:
 "... and then I cherry-picked the remainder of the patches from the
  head of my previous branch"

This is the rest of the original nfsd branch, rebased without the
delegation stuff that I thought really needed to be redone.

I don't like rebasing things like this in general, but in this situation
this was the lesser of two evils.

* 'for-3.5' of git://linux-nfs.org/~bfields/linux: (50 commits)
  nfsd4: fix, consolidate client_has_state
  nfsd4: don't remove rebooted client record until confirmation
  nfsd4: remove some dprintk's and a comment
  nfsd4: return "real" sequence id in confirmed case
  nfsd4: fix exchange_id to return confirm flag
  nfsd4: clarify that renewing expired client is a bug
  nfsd4: simpler ordering of setclientid_confirm checks
  nfsd4: setclientid: remove pointless assignment
  nfsd4: fix error return in non-matching-creds case
  nfsd4: fix setclientid_confirm same_cred check
  nfsd4: merge 3 setclientid cases to 2
  nfsd4: pull out common code from setclientid cases
  nfsd4: merge last two setclientid cases
  nfsd4: setclientid/confirm comment cleanup
  nfsd4: setclientid remove unnecessary terms from a logical expression
  nfsd4: move rq_flavor into svc_cred
  nfsd4: stricter cred comparison for setclientid/exchange_id
  nfsd4: move principal name into svc_cred
  nfsd4: allow removing clients not holding state
  nfsd4: rearrange exchange_id logic to simplify
  ...

6 files changed, 75 insertions, 58 deletions

diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c
index 38f388c39dce..107c4528654f 100644
--- a/net/sunrpc/auth_gss/gss_krb5_wrap.c
+++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c
@@ -381,21 +381,53 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)
 }
 
 /*
- * We cannot currently handle tokens with rotated data.  We need a
- * generalized routine to rotate the data in place.  It is anticipated
- * that we won't encounter rotated data in the general case.
+ * We can shift data by up to LOCAL_BUF_LEN bytes in a pass.  If we need
+ * to do more than that, we shift repeatedly.  Kevin Coffman reports
+ * seeing 28 bytes as the value used by Microsoft clients and servers
+ * with AES, so this constant is chosen to allow handling 28 in one pass
+ * without using too much stack space.
+ *
+ * If that proves to a problem perhaps we could use a more clever
+ * algorithm.
  */
-static u32
-rotate_left(struct krb5_ctx *kctx, u32 offset, struct xdr_buf *buf, u16 rrc)
+#define LOCAL_BUF_LEN 32u
+
+static void rotate_buf_a_little(struct xdr_buf *buf, unsigned int shift)
 {
-        unsigned int realrrc = rrc % (buf->len - offset - GSS_KRB5_TOK_HDR_LEN);
+        char head[LOCAL_BUF_LEN];
+        char tmp[LOCAL_BUF_LEN];
+        unsigned int this_len, i;
+
+        BUG_ON(shift > LOCAL_BUF_LEN);
 
-        if (realrrc == 0)
-                return 0;
+        read_bytes_from_xdr_buf(buf, 0, head, shift);
+        for (i = 0; i + shift < buf->len; i += LOCAL_BUF_LEN) {
+                this_len = min(LOCAL_BUF_LEN, buf->len - (i + shift));
+                read_bytes_from_xdr_buf(buf, i+shift, tmp, this_len);
+                write_bytes_to_xdr_buf(buf, i, tmp, this_len);
+        }
+        write_bytes_to_xdr_buf(buf, buf->len - shift, head, shift);
+}
 
-        dprintk("%s: cannot process token with rotated data: "
-                "rrc %u, realrrc %u\n", __func__, rrc, realrrc);
-        return 1;
+static void _rotate_left(struct xdr_buf *buf, unsigned int shift)
+{
+        int shifted = 0;
+        int this_shift;
+
+        shift %= buf->len;
+        while (shifted < shift) {
+                this_shift = min(shift - shifted, LOCAL_BUF_LEN);
+                rotate_buf_a_little(buf, this_shift);
+                shifted += this_shift;
+        }
+}
+
+static void rotate_left(u32 base, struct xdr_buf *buf, unsigned int shift)
+{
+        struct xdr_buf subbuf;
+
+        xdr_buf_subsegment(buf, &subbuf, base, buf->len - base);
+        _rotate_left(&subbuf, shift);
 }
 
 static u32
@@ -495,11 +527,8 @@ gss_unwrap_kerberos_v2(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)
 
         seqnum = be64_to_cpup((__be64 *)(ptr + 8));
 
-        if (rrc != 0) {
-                err = rotate_left(kctx, offset, buf, rrc);
-                if (err)
-                        return GSS_S_FAILURE;
-        }
+        if (rrc != 0)
+                rotate_left(offset + 16, buf, rrc);
 
         err = (*kctx->gk5e->decrypt_v2)(kctx, offset, buf,
                                         &headskip, &tailskip);
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 3089de37c433..73e957386600 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -336,7 +336,6 @@ struct rsc {
         struct svc_cred         cred;
         struct gss_svc_seq_data seqdata;
         struct gss_ctx          *mechctx;
-        char                    *client_name;
 };
 
 static struct rsc *rsc_update(struct cache_detail *cd, struct rsc *new, struct rsc *old);
@@ -347,9 +346,7 @@ static void rsc_free(struct rsc *rsci)
         kfree(rsci->handle.data);
         if (rsci->mechctx)
                 gss_delete_sec_context(&rsci->mechctx);
-        if (rsci->cred.cr_group_info)
-                put_group_info(rsci->cred.cr_group_info);
-        kfree(rsci->client_name);
+        free_svc_cred(&rsci->cred);
 }
 
 static void rsc_put(struct kref *ref)
@@ -387,7 +384,7 @@ rsc_init(struct cache_head *cnew, struct cache_head *ctmp)
         tmp->handle.data = NULL;
         new->mechctx = NULL;
         new->cred.cr_group_info = NULL;
-        new->client_name = NULL;
+        new->cred.cr_principal = NULL;
 }
 
 static void
@@ -402,8 +399,8 @@ update_rsc(struct cache_head *cnew, struct cache_head *ctmp)
         spin_lock_init(&new->seqdata.sd_lock);
         new->cred = tmp->cred;
         tmp->cred.cr_group_info = NULL;
-        new->client_name = tmp->client_name;
-        tmp->client_name = NULL;
+        new->cred.cr_principal = tmp->cred.cr_principal;
+        tmp->cred.cr_principal = NULL;
 }
 
 static struct cache_head *
@@ -501,8 +498,8 @@ static int rsc_parse(struct cache_detail *cd,
                 /* get client name */
                 len = qword_get(&mesg, buf, mlen);
                 if (len > 0) {
-                        rsci.client_name = kstrdup(buf, GFP_KERNEL);
-                        if (!rsci.client_name)
+                        rsci.cred.cr_principal = kstrdup(buf, GFP_KERNEL);
+                        if (!rsci.cred.cr_principal)
                                 goto out;
                 }
 
@@ -932,16 +929,6 @@ struct gss_svc_data {
         struct rsc                      *rsci;
 };
 
-char *svc_gss_principal(struct svc_rqst *rqstp)
-{
-        struct gss_svc_data *gd = (struct gss_svc_data *)rqstp->rq_auth_data;
-
-        if (gd && gd->rsci)
-                return gd->rsci->client_name;
-        return NULL;
-}
-EXPORT_SYMBOL_GPL(svc_gss_principal);
-
 static int
 svcauth_gss_set_client(struct svc_rqst *rqstp)
 {
@@ -1220,7 +1207,7 @@ svcauth_gss_accept(struct svc_rqst *rqstp, __be32 *authp)
                 }
                 svcdata->rsci = rsci;
                 cache_get(&rsci->h);
-                rqstp->rq_flavor = gss_svc_to_pseudoflavor(
+                rqstp->rq_cred.cr_flavor = gss_svc_to_pseudoflavor(
                                         rsci->mechctx->mech_type, gc->gc_svc);
                 ret = SVC_OK;
                 goto out;
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index 3c0653439f3d..92509ffe15fc 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -180,14 +180,16 @@ void rpcb_put_local(struct net *net)
         struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
         struct rpc_clnt *clnt = sn->rpcb_local_clnt;
         struct rpc_clnt *clnt4 = sn->rpcb_local_clnt4;
-        int shutdown;
+        int shutdown = 0;
 
         spin_lock(&sn->rpcb_clnt_lock);
-        if (--sn->rpcb_users == 0) {
-                sn->rpcb_local_clnt = NULL;
-                sn->rpcb_local_clnt4 = NULL;
+        if (sn->rpcb_users) {
+                if (--sn->rpcb_users == 0) {
+                        sn->rpcb_local_clnt = NULL;
+                        sn->rpcb_local_clnt4 = NULL;
+                }
+                shutdown = !sn->rpcb_users;
         }
-        shutdown = !sn->rpcb_users;
         spin_unlock(&sn->rpcb_clnt_lock);
 
         if (shutdown) {
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 017c0117d154..7e9baaa1e543 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -407,6 +407,14 @@ static int svc_uses_rpcbind(struct svc_serv *serv)
         return 0;
 }
 
+int svc_bind(struct svc_serv *serv, struct net *net)
+{
+        if (!svc_uses_rpcbind(serv))
+                return 0;
+        return svc_rpcb_setup(serv, net);
+}
+EXPORT_SYMBOL_GPL(svc_bind);
+
 /*
  * Create an RPC service
  */
@@ -471,15 +479,8 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
                 spin_lock_init(&pool->sp_lock);
         }
 
-        if (svc_uses_rpcbind(serv)) {
-                if (svc_rpcb_setup(serv, current->nsproxy->net_ns) < 0) {
-                        kfree(serv->sv_pools);
-                        kfree(serv);
-                        return NULL;
-                }
-                if (!serv->sv_shutdown)
-                        serv->sv_shutdown = svc_rpcb_cleanup;
-        }
+        if (svc_uses_rpcbind(serv) && (!serv->sv_shutdown))
+                serv->sv_shutdown = svc_rpcb_cleanup;
 
         return serv;
 }
@@ -536,8 +537,6 @@ EXPORT_SYMBOL_GPL(svc_shutdown_net);
 void
 svc_destroy(struct svc_serv *serv)
 {
-        struct net *net = current->nsproxy->net_ns;
-
         dprintk("svc: svc_destroy(%s, %d)\n",
                                 serv->sv_program->pg_name,
                                 serv->sv_nrthreads);
@@ -552,8 +551,6 @@ svc_destroy(struct svc_serv *serv)
 
         del_timer_sync(&serv->sv_temptimer);
 
-        svc_shutdown_net(serv, net);
-
         /*
          * The last user is gone and thus all sockets have to be destroyed to
          * the point. Check this.
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index b98ee3514912..88f2bf671960 100644
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -598,6 +598,7 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
 
         /* now allocate needed pages.  If we get a failure, sleep briefly */
         pages = (serv->sv_max_mesg + PAGE_SIZE) / PAGE_SIZE;
+        BUG_ON(pages >= RPCSVC_MAXPAGES);
         for (i = 0; i < pages ; i++)
                 while (rqstp->rq_pages[i] == NULL) {
                         struct page *p = alloc_page(GFP_KERNEL);
@@ -612,7 +613,6 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
                         rqstp->rq_pages[i] = p;
                 }
         rqstp->rq_pages[i++] = NULL; /* this might be seen in nfs_read_actor */
-        BUG_ON(pages >= RPCSVC_MAXPAGES);
 
         /* Make arg->head point to first page and arg->pages point to rest */
         arg = &rqstp->rq_arg;
@@ -973,7 +973,7 @@ void svc_close_net(struct svc_serv *serv, struct net *net)
         svc_clear_pools(serv, net);
         /*
          * At this point the sp_sockets lists will stay empty, since
-         * svc_enqueue will not add new entries without taking the
+         * svc_xprt_enqueue will not add new entries without taking the
          * sp_lock and checking XPT_BUSY.
          */
         svc_clear_list(&serv->sv_tempsocks, net);
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index 6138c925923d..2777fa896645 100644
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -746,6 +746,7 @@ svcauth_null_accept(struct svc_rqst *rqstp, __be32 *authp)
         struct svc_cred *cred = &rqstp->rq_cred;
 
         cred->cr_group_info = NULL;
+        cred->cr_principal = NULL;
         rqstp->rq_client = NULL;
 
         if (argv->iov_len < 3*4)
@@ -773,7 +774,7 @@ svcauth_null_accept(struct svc_rqst *rqstp, __be32 *authp)
         svc_putnl(resv, RPC_AUTH_NULL);
         svc_putnl(resv, 0);
 
-        rqstp->rq_flavor = RPC_AUTH_NULL;
+        rqstp->rq_cred.cr_flavor = RPC_AUTH_NULL;
         return SVC_OK;
 }
 
@@ -811,6 +812,7 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
         int             len   = argv->iov_len;
 
         cred->cr_group_info = NULL;
+        cred->cr_principal = NULL;
         rqstp->rq_client = NULL;
 
         if ((len -= 3*4) < 0)
@@ -847,7 +849,7 @@ svcauth_unix_accept(struct svc_rqst *rqstp, __be32 *authp)
         svc_putnl(resv, RPC_AUTH_NULL);
         svc_putnl(resv, 0);
 
-        rqstp->rq_flavor = RPC_AUTH_UNIX;
+        rqstp->rq_cred.cr_flavor = RPC_AUTH_UNIX;
         return SVC_OK;
 
 badcred: