1 files changed, 51 insertions, 2 deletions

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 788adf3897c7..dfed4f5c8fcc 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -1659,7 +1659,7 @@ encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg, struct compoun
         *p = cpu_to_be32(FATTR4_WORD0_ACL);
         p = reserve_space(xdr, 4);
         *p = cpu_to_be32(arg->acl_len);
-        xdr_write_pages(xdr, arg->acl_pages, arg->acl_pgbase, arg->acl_len);
+        xdr_write_pages(xdr, arg->acl_pages, 0, arg->acl_len);
 }
 
 static void
@@ -2491,7 +2491,7 @@ static void nfs4_xdr_enc_getacl(struct rpc_rqst *req, struct xdr_stream *xdr,
         encode_getattr_two(xdr, FATTR4_WORD0_ACL, 0, &hdr);
 
         xdr_inline_pages(&req->rq_rcv_buf, replen << 2,
-                args->acl_pages, args->acl_pgbase, args->acl_len);
+                args->acl_pages, 0, args->acl_len);
 
         encode_nops(&hdr);
 }
@@ -4375,6 +4375,11 @@ static int decode_statfs(struct xdr_stream *xdr, struct nfs_fsstat *fsstat)
                 goto xdr_error;
         if ((status = decode_attr_files_total(xdr, bitmap, &fsstat->tfiles)) != 0)
                 goto xdr_error;
+
+        status = -EIO;
+        if (unlikely(bitmap[0]))
+                goto xdr_error;
+
         if ((status = decode_attr_space_avail(xdr, bitmap, &fsstat->abytes)) != 0)
                 goto xdr_error;
         if ((status = decode_attr_space_free(xdr, bitmap, &fsstat->fbytes)) != 0)
@@ -4574,6 +4579,10 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap,
                 goto xdr_error;
         fattr->valid |= status;
 
+        status = -EIO;
+        if (unlikely(bitmap[0]))
+                goto xdr_error;
+
         status = decode_attr_mode(xdr, bitmap, &fmode);
         if (status < 0)
                 goto xdr_error;
@@ -4627,6 +4636,10 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap,
                 goto xdr_error;
         fattr->valid |= status;
 
+        status = -EIO;
+        if (unlikely(bitmap[1]))
+                goto xdr_error;
+
         status = decode_attr_mdsthreshold(xdr, bitmap, fattr->mdsthreshold);
         if (status < 0)
                 goto xdr_error;
@@ -4764,6 +4777,28 @@ static int decode_attr_layout_blksize(struct xdr_stream *xdr, uint32_t *bitmap,
         return 0;
 }
 
+/*
+ * The granularity of a CLONE operation.
+ */
+static int decode_attr_clone_blksize(struct xdr_stream *xdr, uint32_t *bitmap,
+                                     uint32_t *res)
+{
+        __be32 *p;
+
+        dprintk("%s: bitmap is %x\n", __func__, bitmap[2]);
+        *res = 0;
+        if (bitmap[2] & FATTR4_WORD2_CLONE_BLKSIZE) {
+                p = xdr_inline_decode(xdr, 4);
+                if (unlikely(!p)) {
+                        print_overflow_msg(__func__, xdr);
+                        return -EIO;
+                }
+                *res = be32_to_cpup(p);
+                bitmap[2] &= ~FATTR4_WORD2_CLONE_BLKSIZE;
+        }
+        return 0;
+}
+
 static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo)
 {
         unsigned int savep;
@@ -4789,15 +4824,28 @@ static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo)
         if ((status = decode_attr_maxwrite(xdr, bitmap, &fsinfo->wtmax)) != 0)
                 goto xdr_error;
         fsinfo->wtpref = fsinfo->wtmax;
+
+        status = -EIO;
+        if (unlikely(bitmap[0]))
+                goto xdr_error;
+
         status = decode_attr_time_delta(xdr, bitmap, &fsinfo->time_delta);
         if (status != 0)
                 goto xdr_error;
         status = decode_attr_pnfstype(xdr, bitmap, &fsinfo->layouttype);
         if (status != 0)
                 goto xdr_error;
+
+        status = -EIO;
+        if (unlikely(bitmap[1]))
+                goto xdr_error;
+
         status = decode_attr_layout_blksize(xdr, bitmap, &fsinfo->blksize);
         if (status)
                 goto xdr_error;
+        status = decode_attr_clone_blksize(xdr, bitmap, &fsinfo->clone_blksize);
+        if (status)
+                goto xdr_error;
 
         status = verify_attr_len(xdr, savep, attrlen);
 xdr_error:
@@ -7465,6 +7513,7 @@ struct rpc_procinfo	nfs4_procedures[] = {
         PROC(ALLOCATE,          enc_allocate,           dec_allocate),
         PROC(DEALLOCATE,        enc_deallocate,         dec_deallocate),
         PROC(LAYOUTSTATS,       enc_layoutstats,        dec_layoutstats),
+        PROC(CLONE,             enc_clone,              dec_clone),
 #endif /* CONFIG_NFS_V4_2 */
 };