Merge tag 'v4.12-rc5' into nfsd tree

Update to get f0c3192ceee3 "virtio_net: lower limit on buffer size".
That bug was interfering with my nfsd testing.

3 files changed, 15 insertions, 34 deletions

diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
index 349e355edc73..b8838d3023ff 100644
--- a/fs/nfsd/nfs3xdr.c
+++ b/fs/nfsd/nfs3xdr.c
@@ -339,11 +339,8 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p)
         if (!p)
                 return 0;
         p = xdr_decode_hyper(p, &args->offset);
-        args->count = ntohl(*p++);
-
-        if (!xdr_argsize_check(rqstp, p))
-                return 0;
 
+        args->count = ntohl(*p++);
         len = min(args->count, max_blocksize);
 
         /* set up the kvec */
@@ -357,7 +354,7 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, __be32 *p)
                 v++;
         }
         args->vlen = v;
-        return 1;
+        return xdr_argsize_check(rqstp, p);
 }
 
 int
@@ -555,11 +552,9 @@ nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p)
         p = decode_fh(p, &args->fh);
         if (!p)
                 return 0;
-        if (!xdr_argsize_check(rqstp, p))
-                return 0;
         args->buffer = page_address(*(rqstp->rq_next_page++));
 
-        return 1;
+        return xdr_argsize_check(rqstp, p);
 }
 
 int
@@ -586,14 +581,10 @@ nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p)
         args->verf   = p; p += 2;
         args->dircount = ~0;
         args->count  = ntohl(*p++);
-
-        if (!xdr_argsize_check(rqstp, p))
-                return 0;
-
         args->count  = min_t(u32, args->count, PAGE_SIZE);
         args->buffer = page_address(*(rqstp->rq_next_page++));
 
-        return 1;
+        return xdr_argsize_check(rqstp, p);
 }
 
 int
@@ -611,9 +602,6 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p)
         args->dircount = ntohl(*p++);
         args->count    = ntohl(*p++);
 
-        if (!xdr_argsize_check(rqstp, p))
-                return 0;
-
         len = args->count = min(args->count, max_blocksize);
         while (len > 0) {
                 struct page *p = *(rqstp->rq_next_page++);
@@ -621,7 +609,8 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, __be32 *p)
                         args->buffer = page_address(p);
                 len -= PAGE_SIZE;
         }
-        return 1;
+
+        return xdr_argsize_check(rqstp, p);
 }
 
 int
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index fe6cb5b6d31c..d27e75ad25e3 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1785,6 +1785,12 @@ nfsd4_proc_compound(struct svc_rqst *rqstp)
                         opdesc->op_get_currentstateid(cstate, &op->u);
                 op->status = opdesc->op_func(rqstp, cstate, &op->u);
 
+                /* Only from SEQUENCE */
+                if (cstate->status == nfserr_replay_cache) {
+                        dprintk("%s NFS4.1 replay from cache\n", __func__);
+                        status = op->status;
+                        goto out;
+                }
                 if (!op->status) {
                         if (opdesc->op_set_currentstateid)
                                 opdesc->op_set_currentstateid(cstate, &op->u);
@@ -1795,14 +1801,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp)
                         if (need_wrongsec_check(rqstp))
                                 op->status = check_nfsd_access(current_fh->fh_export, rqstp);
                 }
-
 encode_op:
-                /* Only from SEQUENCE */
-                if (cstate->status == nfserr_replay_cache) {
-                        dprintk("%s NFS4.1 replay from cache\n", __func__);
-                        status = op->status;
-                        goto out;
-                }
                 if (op->status == nfserr_replay_me) {
                         op->replay = &cstate->replay_owner->so_replay;
                         nfsd4_encode_replay(&resp->xdr, op);
diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
index bb1998c5ae61..e4da2717982d 100644
--- a/fs/nfsd/nfsxdr.c
+++ b/fs/nfsd/nfsxdr.c
@@ -261,9 +261,6 @@ nfssvc_decode_readargs(struct svc_rqst *rqstp, __be32 *p)
         len = args->count     = ntohl(*p++);
         p++; /* totalcount - unused */
 
-        if (!xdr_argsize_check(rqstp, p))
-                return 0;
-
         len = min_t(unsigned int, len, NFSSVC_MAXBLKSIZE_V2);
 
         /* set up somewhere to store response.
@@ -279,7 +276,7 @@ nfssvc_decode_readargs(struct svc_rqst *rqstp, __be32 *p)
                 v++;
         }
         args->vlen = v;
-        return 1;
+        return xdr_argsize_check(rqstp, p);
 }
 
 int
@@ -373,11 +370,9 @@ nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, __be32 *p)
         p = decode_fh(p, &args->fh);
         if (!p)
                 return 0;
-        if (!xdr_argsize_check(rqstp, p))
-                return 0;
         args->buffer = page_address(*(rqstp->rq_next_page++));
 
-        return 1;
+        return xdr_argsize_check(rqstp, p);
 }
 
 int
@@ -418,11 +413,9 @@ nfssvc_decode_readdirargs(struct svc_rqst *rqstp, __be32 *p)
         args->cookie = ntohl(*p++);
         args->count  = ntohl(*p++);
         args->count  = min_t(u32, args->count, PAGE_SIZE);
-        if (!xdr_argsize_check(rqstp, p))
-                return 0;
         args->buffer = page_address(*(rqstp->rq_next_page++));
 
-        return 1;
+        return xdr_argsize_check(rqstp, p);
 }
 
 /*