Commit 9272f2dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs/smb3 updates from Steve French:
 "Improved SMB3 support (symlink and device emulation, and remapping by
  default the 7 reserved posix characters) and a workaround for cifs
  mounts to Mac (working around a commonly encountered Mac server bug)"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] Remove obsolete comment
  Check minimum response length on query_network_interface
  Workaround Mac server problem
  Remap reserved posix characters by default (part 3/3)
  Allow conversion of characters in Mac remap range (part 2)
  Allow conversion of characters in Mac remap range. Part 1
  mfsymlinks support for SMB2.1/SMB3. Part 2 query symlink
  Add mfsymlinks support for SMB2.1/SMB3. Part 1 create symlink
  Allow mknod and mkfifo on SMB2/SMB3 mounts
  add defines for two new file attributes
parents e83e4323 ff273cb8

fs/cifs/cifs_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#define CIFS_MOUNT_POSIXACL	0x100000 /* mirror of MS_POSIXACL in mnt_cifs_flags */

#define CIFS_MOUNT_CIFS_BACKUPUID 0x200000 /* backup intent bit for a user */

#define CIFS_MOUNT_CIFS_BACKUPGID 0x400000 /* backup intent bit for a group */

#define CIFS_MOUNT_MAP_SFM_CHR	0x800000 /* SFM/MAC mapping for illegal chars */



struct cifs_sb_info {

	struct rb_root tlink_tree;

fs/cifs/cifs_unicode.c

+154 −49
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
 */

#include <linux/fs.h>

#include <linux/slab.h>

#include "cifs_fs_sb.h"

#include "cifs_unicode.h"

#include "cifs_uniupr.h"

#include "cifspdu.h"
@@ -61,26 +62,24 @@ cifs_utf16_bytes(const __le16 *from, int maxbytes, 
	return outlen;

}



/*

 * cifs_mapchar - convert a host-endian char to proper char in codepage

 * @target - where converted character should be copied

 * @src_char - 2 byte host-endian source character

 * @cp - codepage to which character should be converted

 * @mapchar - should character be mapped according to mapchars mount option?

 *

 * This function handles the conversion of a single character. It is the

 * responsibility of the caller to ensure that the target buffer is large

 * enough to hold the result of the conversion (at least NLS_MAX_CHARSET_SIZE).

 */

static int

cifs_mapchar(char *target, const __u16 src_char, const struct nls_table *cp,

	     bool mapchar)

int cifs_remap(struct cifs_sb_info *cifs_sb)

{

	int len = 1;

	int map_type;



	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SFM_CHR)

		map_type = SFM_MAP_UNI_RSVD;

	else if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR)

		map_type = SFU_MAP_UNI_RSVD;

	else

		map_type = NO_MAP_UNI_RSVD;



	if (!mapchar)

		goto cp_convert;

	return map_type;

}



/* Convert character using the SFU - "Services for Unix" remapping range */

static bool

convert_sfu_char(const __u16 src_char, char *target)

{

	/*

	 * BB: Cannot handle remapping UNI_SLASH until all the calls to

	 *     build_path_from_dentry are modified, as they use slash as
@@ -106,19 +105,74 @@ cifs_mapchar(char *target, const __u16 src_char, const struct nls_table *cp, 
		*target = '<';

		break;

	default:

		goto cp_convert;

		return false;

	}

	return true;

}



/* Convert character using the SFM - "Services for Mac" remapping range */

static bool

convert_sfm_char(const __u16 src_char, char *target)

{

	switch (src_char) {

	case SFM_COLON:

		*target = ':';

		break;

	case SFM_ASTERISK:

		*target = '*';

		break;

	case SFM_QUESTION:

		*target = '?';

		break;

	case SFM_PIPE:

		*target = '|';

		break;

	case SFM_GRTRTHAN:

		*target = '>';

		break;

	case SFM_LESSTHAN:

		*target = '<';

		break;

	case SFM_SLASH:

		*target = '\\';

		break;

	default:

		return false;

	}

	return true;

}



out:



/*

 * cifs_mapchar - convert a host-endian char to proper char in codepage

 * @target - where converted character should be copied

 * @src_char - 2 byte host-endian source character

 * @cp - codepage to which character should be converted

 * @map_type - How should the 7 NTFS/SMB reserved characters be mapped to UCS2?

 *

 * This function handles the conversion of a single character. It is the

 * responsibility of the caller to ensure that the target buffer is large

 * enough to hold the result of the conversion (at least NLS_MAX_CHARSET_SIZE).

 */

static int

cifs_mapchar(char *target, const __u16 src_char, const struct nls_table *cp,

	     int maptype)

{

	int len = 1;



	if ((maptype == SFM_MAP_UNI_RSVD) && convert_sfm_char(src_char, target))

		return len;

	else if ((maptype == SFU_MAP_UNI_RSVD) &&

		  convert_sfu_char(src_char, target))

		return len;



cp_convert:

	/* if character not one of seven in special remap set */

	len = cp->uni2char(src_char, target, NLS_MAX_CHARSET_SIZE);

	if (len <= 0) {

		*target = '?';

		len = 1;

	}

	goto out;

	return len;

}



/*
@@ -145,7 +199,7 @@ cp_convert: 
 */

int

cifs_from_utf16(char *to, const __le16 *from, int tolen, int fromlen,

		 const struct nls_table *codepage, bool mapchar)

		const struct nls_table *codepage, int map_type)

{

	int i, charlen, safelen;

	int outlen = 0;
@@ -172,13 +226,13 @@ cifs_from_utf16(char *to, const __le16 *from, int tolen, int fromlen, 
		 * conversion bleed into the null terminator

		 */

		if (outlen >= safelen) {

			charlen = cifs_mapchar(tmp, ftmp, codepage, mapchar);

			charlen = cifs_mapchar(tmp, ftmp, codepage, map_type);

			if ((outlen + charlen) > (tolen - nullsize))

				break;

		}



		/* put converted char into 'to' buffer */

		charlen = cifs_mapchar(&to[outlen], ftmp, codepage, mapchar);

		charlen = cifs_mapchar(&to[outlen], ftmp, codepage, map_type);

		outlen += charlen;

	}
@@ -267,7 +321,7 @@ cifs_strndup_from_utf16(const char *src, const int maxlen, 
		if (!dst)

			return NULL;

		cifs_from_utf16(dst, (__le16 *) src, len, maxlen, codepage,

			       false);

			       NO_MAP_UNI_RSVD);

	} else {

		len = strnlen(src, maxlen);

		len++;
@@ -280,6 +334,66 @@ cifs_strndup_from_utf16(const char *src, const int maxlen, 
	return dst;

}



static __le16 convert_to_sfu_char(char src_char)

{

	__le16 dest_char;



	switch (src_char) {

	case ':':

		dest_char = cpu_to_le16(UNI_COLON);

		break;

	case '*':

		dest_char = cpu_to_le16(UNI_ASTERISK);

		break;

	case '?':

		dest_char = cpu_to_le16(UNI_QUESTION);

		break;

	case '<':

		dest_char = cpu_to_le16(UNI_LESSTHAN);

		break;

	case '>':

		dest_char = cpu_to_le16(UNI_GRTRTHAN);

		break;

	case '|':

		dest_char = cpu_to_le16(UNI_PIPE);

		break;

	default:

		dest_char = 0;

	}



	return dest_char;

}



static __le16 convert_to_sfm_char(char src_char)

{

	__le16 dest_char;



	switch (src_char) {

	case ':':

		dest_char = cpu_to_le16(SFM_COLON);

		break;

	case '*':

		dest_char = cpu_to_le16(SFM_ASTERISK);

		break;

	case '?':

		dest_char = cpu_to_le16(SFM_QUESTION);

		break;

	case '<':

		dest_char = cpu_to_le16(SFM_LESSTHAN);

		break;

	case '>':

		dest_char = cpu_to_le16(SFM_GRTRTHAN);

		break;

	case '|':

		dest_char = cpu_to_le16(SFM_PIPE);

		break;

	default:

		dest_char = 0;

	}



	return dest_char;

}



/*

 * Convert 16 bit Unicode pathname to wire format from string in current code

 * page. Conversion may involve remapping up the six characters that are
@@ -288,7 +402,7 @@ cifs_strndup_from_utf16(const char *src, const int maxlen, 
 */

int

cifsConvertToUTF16(__le16 *target, const char *source, int srclen,

		 const struct nls_table *cp, int mapChars)

		 const struct nls_table *cp, int map_chars)

{

	int i, charlen;

	int j = 0;
@@ -296,39 +410,30 @@ cifsConvertToUTF16(__le16 *target, const char *source, int srclen, 
	__le16 dst_char;

	wchar_t tmp;



	if (!mapChars)

	if (map_chars == NO_MAP_UNI_RSVD)

		return cifs_strtoUTF16(target, source, PATH_MAX, cp);



	for (i = 0; i < srclen; j++) {

		src_char = source[i];

		charlen = 1;

		switch (src_char) {

		case 0:



		/* check if end of string */

		if (src_char == 0)

			goto ctoUTF16_out;

		case ':':

			dst_char = cpu_to_le16(UNI_COLON);

			break;

		case '*':

			dst_char = cpu_to_le16(UNI_ASTERISK);

			break;

		case '?':

			dst_char = cpu_to_le16(UNI_QUESTION);

			break;

		case '<':

			dst_char = cpu_to_le16(UNI_LESSTHAN);

			break;

		case '>':

			dst_char = cpu_to_le16(UNI_GRTRTHAN);

			break;

		case '|':

			dst_char = cpu_to_le16(UNI_PIPE);

			break;



		/* see if we must remap this char */

		if (map_chars == SFU_MAP_UNI_RSVD)

			dst_char = convert_to_sfu_char(src_char);

		else if (map_chars == SFM_MAP_UNI_RSVD)

			dst_char = convert_to_sfm_char(src_char);

		else

			dst_char = 0;

		/*

		 * FIXME: We can not handle remapping backslash (UNI_SLASH)

		 * until all the calls to build_path_from_dentry are modified,

		 * as they use backslash as separator.

		 */

		default:

		if (dst_char == 0) {

			charlen = cp->char2uni(source + i, srclen - i, &tmp);

			dst_char = cpu_to_le16(tmp);

fs/cifs/cifs_unicode.h

+30 −1
Original line number Diff line number Diff line
@@ -52,6 +52,34 @@ 
#define UNI_PIPE        (__u16) ('|' + 0xF000)

#define UNI_SLASH       (__u16) ('\\' + 0xF000)



/*

 * Macs use an older "SFM" mapping of the symbols above. Fortunately it does

 * not conflict (although almost does) with the mapping above.

 */



#define SFM_ASTERISK    ((__u16) 0xF021)

#define SFM_QUESTION    ((__u16) 0xF025)

#define SFM_COLON       ((__u16) 0xF022)

#define SFM_GRTRTHAN    ((__u16) 0xF024)

#define SFM_LESSTHAN    ((__u16) 0xF023)

#define SFM_PIPE        ((__u16) 0xF027)

#define SFM_SLASH       ((__u16) 0xF026)



/*

 * Mapping mechanism to use when one of the seven reserved characters is

 * encountered.  We can only map using one of the mechanisms at a time

 * since otherwise readdir could return directory entries which we would

 * not be able to open

 *

 * NO_MAP_UNI_RSVD  = do not perform any remapping of the character

 * SFM_MAP_UNI_RSVD = map reserved characters using SFM scheme (MAC compatible)

 * SFU_MAP_UNI_RSVD = map reserved characters ala SFU ("mapchars" option)

 *

 */

#define NO_MAP_UNI_RSVD		0

#define SFM_MAP_UNI_RSVD	1

#define SFU_MAP_UNI_RSVD	2



/* Just define what we want from uniupr.h.  We don't want to define the tables

 * in each source file.

 */
@@ -75,7 +103,7 @@ extern const struct UniCaseRange CifsUniLowerRange[]; 


#ifdef __KERNEL__

int cifs_from_utf16(char *to, const __le16 *from, int tolen, int fromlen,

		    const struct nls_table *codepage, bool mapchar);

		    const struct nls_table *cp, int map_type);

int cifs_utf16_bytes(const __le16 *from, int maxbytes,

		     const struct nls_table *codepage);

int cifs_strtoUTF16(__le16 *, const char *, int, const struct nls_table *);
@@ -84,6 +112,7 @@ char *cifs_strndup_from_utf16(const char *src, const int maxlen, 
			      const struct nls_table *codepage);

extern int cifsConvertToUTF16(__le16 *target, const char *source, int maxlen,

			      const struct nls_table *cp, int mapChars);

extern int cifs_remap(struct cifs_sb_info *cifs_sb);

#ifdef CONFIG_CIFS_SMB2

extern __le16 *cifs_strndup_to_utf16(const char *src, const int maxlen,

				     int *utf16_len, const struct nls_table *cp,

fs/cifs/cifsencrypt.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ find_domain_name(struct cifs_ses *ses, const struct nls_table *nls_cp) 
						return -ENOMEM;

				cifs_from_utf16(ses->domainName,

					(__le16 *)blobptr, attrsize, attrsize,

					nls_cp, false);

					nls_cp, NO_MAP_UNI_RSVD);

				break;

			}

		}

fs/cifs/cifsglob.h

+4 −2
Original line number Diff line number Diff line
@@ -323,11 +323,11 @@ struct smb_version_operations { 
	int (*async_writev)(struct cifs_writedata *,

			    void (*release)(struct kref *));

	/* sync read from the server */

	int (*sync_read)(const unsigned int, struct cifsFileInfo *,

	int (*sync_read)(const unsigned int, struct cifs_fid *,

			 struct cifs_io_parms *, unsigned int *, char **,

			 int *);

	/* sync write to the server */

	int (*sync_write)(const unsigned int, struct cifsFileInfo *,

	int (*sync_write)(const unsigned int, struct cifs_fid *,

			  struct cifs_io_parms *, unsigned int *, struct kvec *,

			  unsigned long);

	/* open dir, start readdir */
@@ -466,6 +466,7 @@ struct smb_vol { 
	bool direct_io:1;

	bool strict_io:1; /* strict cache behavior */

	bool remap:1;      /* set to remap seven reserved chars in filenames */

	bool sfu_remap:1;  /* remap seven reserved chars ala SFU */

	bool posix_paths:1; /* unset to not ask for posix pathnames. */

	bool no_linux_ext:1;

	bool sfu_emul:1;
@@ -499,6 +500,7 @@ struct smb_vol { 
#define CIFS_MOUNT_MASK (CIFS_MOUNT_NO_PERM | CIFS_MOUNT_SET_UID | \

			 CIFS_MOUNT_SERVER_INUM | CIFS_MOUNT_DIRECT_IO | \

			 CIFS_MOUNT_NO_XATTR | CIFS_MOUNT_MAP_SPECIAL_CHR | \

			 CIFS_MOUNT_MAP_SFM_CHR | \

			 CIFS_MOUNT_UNX_EMUL | CIFS_MOUNT_NO_BRL | \

			 CIFS_MOUNT_CIFS_ACL | CIFS_MOUNT_OVERR_UID | \

			 CIFS_MOUNT_OVERR_GID | CIFS_MOUNT_DYNPERM | \

CRA Git | Maintained and supported by SUSTech CRA and CCSE