diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2014-12-07 22:05:47 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2014-12-09 21:51:30 +0100 |
| commit | 5a64e56976f1ba98743e1678c0029a98e9034c81 (patch) | |
| tree | c28873700fa8afcc9eaa5b56fb3d601163820d80 /fs/nfsd | |
| parent | sunrpc/cache: convert to use string_escape_str() (diff) | |
| download | linux-5a64e56976f1ba98743e1678c0029a98e9034c81.tar.xz linux-5a64e56976f1ba98743e1678c0029a98e9034c81.zip | |
nfsd4: fix xdr4 inclusion of escaped char
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: e7a0444aef4a "nfsd: add IPv6 addr escaping to fs_location hosts"
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4xdr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 8880ec8cfd11..a8549f8fef57 100644 --- 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); |