diff options
| author | Benjamin Coddington <bcodding@redhat.com> | 2014-12-07 16:05:47 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-16 06:59:33 -0800 |
| commit | 0cd81f595375b4eaa0d3dfb779daecc82691044c (patch) | |
| tree | 7ceb307885c2ab03b3eb21cf2402fecb99c8bb18 | |
| parent | d7d13fde8bc716a2cdc83964cbefcb1ba6af13f8 (diff) | |
| download | lwn-0cd81f595375b4eaa0d3dfb779daecc82691044c.tar.gz lwn-0cd81f595375b4eaa0d3dfb779daecc82691044c.zip | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 86573350350e..dd1afa38f2ae 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1809,6 +1809,9 @@ static __be32 nfsd4_encode_components_esc(char sep, char *components, } else end++; + if (found_esc) + end = next; + str = end; } *pp = p; |