nfsd4: use xdr_reserve_space in attribute encoding

This is a cosmetic change for now; no change in behavior.

Note we're just depending on xdr_reserve_space to do the bounds checking
for us, we're not really depending on its adjustment of iovec or xdr_buf
lengths yet, as those are fixed up by as necessary after the fact by
read-link operations and by nfs4svc_encode_compoundres.  However we do
have to update xdr->iov on read-like operations to prevent
xdr_reserve_space from messing with the already-fixed-up length of the
the head.

When the attribute encoding fails partway through we have to undo the
length adjustments made so far.  We do it manually for now, but later
patches will add an xdr_truncate_encode() helper to handle cases like
this.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/fs/nfsd/nfs4acl.c b/fs/nfsd/nfs4acl.c
index 7c7c02554a81..d714156a19fd 100644
--- a/fs/nfsd/nfs4acl.c
+++ b/fs/nfsd/nfs4acl.c
@@ -919,20 +919,19 @@ nfs4_acl_get_whotype(char *p, u32 len)
         return NFS4_ACL_WHO_NAMED;
 }
 
-__be32 nfs4_acl_write_who(int who, __be32 **p, int *len)
+__be32 nfs4_acl_write_who(struct xdr_stream *xdr, int who)
 {
+        __be32 *p;
         int i;
-        int bytes;
 
         for (i = 0; i < ARRAY_SIZE(s2t_map); i++) {
                 if (s2t_map[i].type != who)
                         continue;
-                bytes = 4 + (XDR_QUADLEN(s2t_map[i].stringlen) << 2);
-                if (bytes > *len)
+                p = xdr_reserve_space(xdr, s2t_map[i].stringlen + 4);
+                if (!p)
                         return nfserr_resource;
-                *p = xdr_encode_opaque(*p, s2t_map[i].string,
+                p = xdr_encode_opaque(p, s2t_map[i].string,
                                         s2t_map[i].stringlen);
-                *len -= bytes;
                 return 0;
         }
         WARN_ON_ONCE(1);