diff options
| author | Björn Jacke <bj@sernet.de> | 2017-05-05 04:36:16 +0200 |
|---|---|---|
| committer | Steve French <smfrench@gmail.com> | 2017-05-05 08:33:44 -0500 |
| commit | 85435d7a15294f9f7ef23469e6aaf7c5dfcc54f0 (patch) | |
| tree | bf7fba3883958ac0287cabd0a6eba74fc8e4823f | |
| parent | 7db0a6efdc3e990cdfd4b24820d010e9eb7890ad (diff) | |
| download | linux-85435d7a15294f9f7ef23469e6aaf7c5dfcc54f0.tar.gz | |
CIFS: add misssing SFM mapping for doublequote
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>
| -rw-r--r-- | fs/cifs/cifs_unicode.c | 6 | ||||
| -rw-r--r-- | fs/cifs/cifs_unicode.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c index 02b071bf3732..a0b3e7d1be48 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/cifs/cifs_unicode.c @@ -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; diff --git a/fs/cifs/cifs_unicode.h b/fs/cifs/cifs_unicode.h index 7bfb76e60401..8a79a34e66b8 100644 --- a/fs/cifs/cifs_unicode.h +++ b/fs/cifs/cifs_unicode.h @@ -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) |