From: Benjamin Coddington <bcodding@redhat.com>
Date: Sun, 7 Dec 2014 21:05:47 +0000 (-0500)
Subject: nfsd4: fix xdr4 inclusion of escaped char
X-Git-Tag: v3.16.35~3263
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd7d0a82cdceee2a1e15b5554d742ccc933a25c8;p=thirdparty%2Fkernel%2Fstable.git

nfsd4: fix xdr4 inclusion of escaped char

commit 5a64e56976f1ba98743e1678c0029a98e9034c81 upstream.

Fix a bug where nfsd4_encode_components_esc() includes the esc_end char as
an additional string encoding.

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Fixes: e7a0444aef4a "nfsd: add IPv6 addr escaping to fs_location hosts"
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 96338175a2fea..69f15dc9e16bb 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1777,6 +1777,9 @@ static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep,
 		}
 		else
 			end++;
+		if (found_esc)
+			end = next;
+
 		str = end;
 	}
 	pathlen = htonl(xdr->buf->len - pathlen_offset);