--- /dev/null
+From 57c176074057531b249cf522d90c22313fa74b0b Mon Sep 17 00:00:00 2001
+From: Boris Protopopov <pboris@amazon.com>
+Date: Thu, 24 Sep 2020 00:36:38 +0000
+Subject: Convert trailing spaces and periods in path components
+
+From: Boris Protopopov <pboris@amazon.com>
+
+commit 57c176074057531b249cf522d90c22313fa74b0b upstream.
+
+When converting trailing spaces and periods in paths, do so
+for every component of the path, not just the last component.
+If the conversion is not done for every path component, then
+subsequent operations in directories with trailing spaces or
+periods (e.g. create(), mkdir()) will fail with ENOENT. This
+is because on the server, the directory will have a special
+symbol in its name, and the client needs to provide the same.
+
+Signed-off-by: Boris Protopopov <pboris@amazon.com>
+Acked-by: Ronnie Sahlberg <lsahlber@redhat.com>
+Signed-off-by: Steve French <stfrench@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/cifs/cifs_unicode.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/fs/cifs/cifs_unicode.c
++++ b/fs/cifs/cifs_unicode.c
+@@ -488,7 +488,13 @@ cifsConvertToUTF16(__le16 *target, const
+ else if (map_chars == SFM_MAP_UNI_RSVD) {
+ bool end_of_string;
+
+- if (i == srclen - 1)
++ /**
++ * Remap spaces and periods found at the end of every
++ * component of the path. The special cases of '.' and
++ * '..' do not need to be dealt with explicitly because
++ * they are addressed in namei.c:link_path_walk().
++ **/
++ if ((i == srclen - 1) || (source[i+1] == '\\'))
+ end_of_string = true;
+ else
+ end_of_string = false;