1 files changed, 44 insertions, 18 deletions

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 74c00bc92b9a..4949667c84ea 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1674,12 +1674,12 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
 
 static void write32(__be32 **p, u32 n)
 {
-        *(*p)++ = n;
+        *(*p)++ = htonl(n);
 }
 
 static void write64(__be32 **p, u64 n)
 {
-        write32(p, (u32)(n >> 32));
+        write32(p, (n >> 32));
         write32(p, (u32)n);
 }
 
@@ -1744,15 +1744,16 @@ static void encode_seqid_op_tail(struct nfsd4_compoundres *resp, __be32 *save, _
 }
 
 /* Encode as an array of strings the string given with components
- * separated @sep.
+ * separated @sep, escaped with esc_enter and esc_exit.
  */
-static __be32 nfsd4_encode_components(char sep, char *components,
-                                   __be32 **pp, int *buflen)
+static __be32 nfsd4_encode_components_esc(char sep, char *components,
+                                   __be32 **pp, int *buflen,
+                                   char esc_enter, char esc_exit)
 {
         __be32 *p = *pp;
         __be32 *countp = p;
         int strlen, count=0;
-        char *str, *end;
+        char *str, *end, *next;
 
         dprintk("nfsd4_encode_components(%s)\n", components);
         if ((*buflen -= 4) < 0)
@@ -1760,8 +1761,23 @@ static __be32 nfsd4_encode_components(char sep, char *components,
         WRITE32(0); /* We will fill this in with @count later */
         end = str = components;
         while (*end) {
-                for (; *end && (*end != sep); end++)
-                        ; /* Point to end of component */
+                bool found_esc = false;
+
+                /* try to parse as esc_start, ..., esc_end, sep */
+                if (*str == esc_enter) {
+                        for (; *end && (*end != esc_exit); end++)
+                                /* find esc_exit or end of string */;
+                        next = end + 1;
+                        if (*end && (!*next || *next == sep)) {
+                                str++;
+                                found_esc = true;
+                        }
+                }
+
+                if (!found_esc)
+                        for (; *end && (*end != sep); end++)
+                                /* find sep or end of string */;
+
                 strlen = end - str;
                 if (strlen) {
                         if ((*buflen -= ((XDR_QUADLEN(strlen) << 2) + 4)) < 0)
@@ -1780,6 +1796,15 @@ static __be32 nfsd4_encode_components(char sep, char *components,
         return 0;
 }
 
+/* Encode as an array of strings the string given with components
+ * separated @sep.
+ */
+static __be32 nfsd4_encode_components(char sep, char *components,
+                                   __be32 **pp, int *buflen)
+{
+        return nfsd4_encode_components_esc(sep, components, pp, buflen, 0, 0);
+}
+
 /*
  * encode a location element of a fs_locations structure
  */
@@ -1789,7 +1814,8 @@ static __be32 nfsd4_encode_fs_location4(struct nfsd4_fs_location *location,
         __be32 status;
         __be32 *p = *pp;
 
-        status = nfsd4_encode_components(':', location->hosts, &p, buflen);
+        status = nfsd4_encode_components_esc(':', location->hosts, &p, buflen,
+                                                '[', ']');
         if (status)
                 return status;
         status = nfsd4_encode_components('/', location->path, &p, buflen);
@@ -3251,7 +3277,7 @@ nfsd4_encode_write(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_w
 }
 
 static __be32
-nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, int nfserr,
+nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,
                          struct nfsd4_exchange_id *exid)
 {
         __be32 *p;
@@ -3306,7 +3332,7 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, int nfserr,
 }
 
 static __be32
-nfsd4_encode_create_session(struct nfsd4_compoundres *resp, int nfserr,
+nfsd4_encode_create_session(struct nfsd4_compoundres *resp, __be32 nfserr,
                             struct nfsd4_create_session *sess)
 {
         __be32 *p;
@@ -3355,14 +3381,14 @@ nfsd4_encode_create_session(struct nfsd4_compoundres *resp, int nfserr,
 }
 
 static __be32
-nfsd4_encode_destroy_session(struct nfsd4_compoundres *resp, int nfserr,
+nfsd4_encode_destroy_session(struct nfsd4_compoundres *resp, __be32 nfserr,
                              struct nfsd4_destroy_session *destroy_session)
 {
         return nfserr;
 }
 
 static __be32
-nfsd4_encode_free_stateid(struct nfsd4_compoundres *resp, int nfserr,
+nfsd4_encode_free_stateid(struct nfsd4_compoundres *resp, __be32 nfserr,
                           struct nfsd4_free_stateid *free_stateid)
 {
         __be32 *p;
@@ -3371,13 +3397,13 @@ nfsd4_encode_free_stateid(struct nfsd4_compoundres *resp, int nfserr,
                 return nfserr;
 
         RESERVE_SPACE(4);
-        WRITE32(nfserr);
+        *p++ = nfserr;
         ADJUST_ARGS();
         return nfserr;
 }
 
 static __be32
-nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr,
+nfsd4_encode_sequence(struct nfsd4_compoundres *resp, __be32 nfserr,
                       struct nfsd4_sequence *seq)
 {
         __be32 *p;
@@ -3399,8 +3425,8 @@ nfsd4_encode_sequence(struct nfsd4_compoundres *resp, int nfserr,
         return 0;
 }
 
-__be32
-nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, int nfserr,
+static __be32
+nfsd4_encode_test_stateid(struct nfsd4_compoundres *resp, __be32 nfserr,
                           struct nfsd4_test_stateid *test_stateid)
 {
         struct nfsd4_test_stateid_id *stateid, *next;
@@ -3503,7 +3529,7 @@ static nfsd4_enc nfsd4_enc_ops[] = {
  * Our se_fmaxresp_cached will always be a multiple of PAGE_SIZE, and so
  * will be at least a page and will therefore hold the xdr_buf head.
  */
-int nfsd4_check_resp_size(struct nfsd4_compoundres *resp, u32 pad)
+__be32 nfsd4_check_resp_size(struct nfsd4_compoundres *resp, u32 pad)
 {
         struct xdr_buf *xb = &resp->rqstp->rq_res;
         struct nfsd4_session *session = NULL;