nfsd4: fix xdr4 inclusion of escaped char

bcodding-rh · J. Bruce Fields · commit 5a64e56976f1 · 2014-12-09T15:51:30.000-05:00
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> Cc: stable@vger.kernel.org Fixes: e7a0444 "nfsd: add IPv6 addr escaping to fs_location hosts" Signed-off-by: J. Bruce Fields <bfields@redhat.com>
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
@@ -1812,6 +1812,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);

Original file line number	Diff line number	Diff line change
`@@ -1812,6 +1812,9 @@ static __be32 nfsd4_encode_components_esc(struct xdr_stream *xdr, char sep,`
`1812`	`1812`	`}`
`1813`	`1813`	`else`
`1814`	`1814`	`end++;`
	`1815`	`+ if (found_esc)`
	`1816`	`+ end = next;`
	`1817`	`+`
`1815`	`1818`	`str = end;`
`1816`	`1819`	`}`
`1817`	`1820`	`pathlen = htonl(xdr->buf->len - pathlen_offset);`