| From | Jiri Slaby <> | Subject | [PATCH 3.12 041/176] nfsd4: fix xdr4 inclusion of escaped char | Date | Wed, 28 Jan 2015 15:27:51 +0100 |
| |
From: Benjamin Coddington <bcodding@redhat.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
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: Jiri Slaby <jslaby@suse.cz> --- fs/nfsd/nfs4xdr.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 42c8c8aeb465..1c825aee736d 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1786,6 +1786,9 @@ static __be32 nfsd4_encode_components_esc(char sep, char *components, } else end++; + if (found_esc) + end = next; + str = end; } *pp = p; -- 2.2.2
|