]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
CIFS: add misssing SFM mapping for doublequote
authorBjörn Jacke <bj@sernet.de>
Fri, 5 May 2017 02:36:16 +0000 (04:36 +0200)
committerSteve French <smfrench@gmail.com>
Fri, 5 May 2017 13:33:44 +0000 (08:33 -0500)
SFM is mapping doublequote to 0xF020

Without this patch creating files with doublequote fails to Windows/Mac

Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
CC: stable <stable@vger.kernel.org>
fs/cifs/cifs_unicode.c
fs/cifs/cifs_unicode.h

index 02b071bf3732ac29808183974636e2ac9ca56ce6..a0b3e7d1be484fd3f026258577e18c165f738f0e 100644 (file)
@@ -83,6 +83,9 @@ convert_sfm_char(const __u16 src_char, char *target)
        case SFM_COLON:
                *target = ':';
                break;
+       case SFM_DOUBLEQUOTE:
+               *target = '"';
+               break;
        case SFM_ASTERISK:
                *target = '*';
                break;
@@ -418,6 +421,9 @@ static __le16 convert_to_sfm_char(char src_char, bool end_of_string)
        case ':':
                dest_char = cpu_to_le16(SFM_COLON);
                break;
+       case '"':
+               dest_char = cpu_to_le16(SFM_DOUBLEQUOTE);
+               break;
        case '*':
                dest_char = cpu_to_le16(SFM_ASTERISK);
                break;
index 7bfb76e6040197638c140528cf14c84d478a27f7..8a79a34e66b8bee8cf9575eda76c77faae30862e 100644 (file)
@@ -57,6 +57,7 @@
  * not conflict (although almost does) with the mapping above.
  */
 
+#define SFM_DOUBLEQUOTE ((__u16) 0xF020)
 #define SFM_ASTERISK    ((__u16) 0xF021)
 #define SFM_QUESTION    ((__u16) 0xF025)
 #define SFM_COLON       ((__u16) 0xF022)