diff options
author | Björn JACKE <bjacke@samba.org> | 2017-06-01 11:00:06 +0200 |
---|---|---|
committer | Steve French <smfrench@gmail.com> | 2017-07-05 19:58:05 -0500 |
commit | 7e46f0900acdd8cc26588d8f6abdf2ed75dfbcd8 (patch) | |
tree | 39e4fbb4157b18481288682c06d97363be173f5c | |
parent | 84908426f2097d5c6e254c73ffcb6923a355dbda (diff) | |
download | op-kernel-dev-7e46f0900acdd8cc26588d8f6abdf2ed75dfbcd8.zip op-kernel-dev-7e46f0900acdd8cc26588d8f6abdf2ed75dfbcd8.tar.gz |
CIFS: add SFM mapping for 0x01-0x1F
Hi,
attached patch adds more missing mappings for the 0x01-0x1f range. Please
review, if you're fine with it, considere it also for stable.
Björn
>From a97720c26db2ee77d4e798e3d383fcb6a348bd29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bjacke@samba.org>
Date: Wed, 31 May 2017 22:48:41 +0200
Subject: [PATCH] cifs: add SFM mapping for 0x01-0x1F
0x1-0x1F has to be mapped to 0xF001-0xF01F
Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Signed-off-by: Steve French <smfrench@gmail.com>
-rw-r--r-- | fs/cifs/cifs_unicode.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/cifs/cifs_unicode.c b/fs/cifs/cifs_unicode.c index a0b3e7d..e0445e2 100644 --- a/fs/cifs/cifs_unicode.c +++ b/fs/cifs/cifs_unicode.c @@ -79,6 +79,10 @@ convert_sfu_char(const __u16 src_char, char *target) static bool convert_sfm_char(const __u16 src_char, char *target) { + if (src_char >= 0xF001 && src_char <= 0xF01F) { + *target = src_char - 0xF000; + return true; + } switch (src_char) { case SFM_COLON: *target = ':'; @@ -417,6 +421,10 @@ static __le16 convert_to_sfm_char(char src_char, bool end_of_string) { __le16 dest_char; + if (src_char >= 0x01 && src_char <= 0x1F) { + dest_char = cpu_to_le16(src_char + 0xF000); + return dest_char; + } switch (src_char) { case ':': dest_char = cpu_to_le16(SFM_COLON); |