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);