Commit 7908b3ef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.samba.org/sfrench/cifs-2.6 

* git://git.samba.org/sfrench/cifs-2.6:
  CIFS: Rename *UCS* functions to *UTF16*
  [CIFS] ACL and FSCACHE support no longer EXPERIMENTAL
  [CIFS] Fix build break with multiuser patch when LANMAN disabled
  cifs: warn about impending deprecation of legacy MultiuserMount code
  cifs: fetch credentials out of keyring for non-krb5 auth multiuser mounts
  cifs: sanitize username handling
  keys: add a "logon" key type
  cifs: lower default wsize when unix extensions are not used
  cifs: better instrumentation for coalesce_t2
  cifs: integer overflow in parse_dacl()
  cifs: Fix sparse warning when calling cifs_strtoUCS
  CIFS: Add descriptions to the brlock cache functions
parents dcd6c922 acbbb76a

fs/cifs/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ config CIFS_DFS_UPCALL 


config CIFS_FSCACHE

	  bool "Provide CIFS client caching support (EXPERIMENTAL)"

	  depends on EXPERIMENTAL

	  depends on CIFS=m && FSCACHE || CIFS=y && FSCACHE=y

	  help

	    Makes CIFS FS-Cache capable. Say Y here if you want your CIFS data
@@ -149,7 +148,7 @@ config CIFS_FSCACHE 


config CIFS_ACL

	  bool "Provide CIFS ACL support (EXPERIMENTAL)"

	  depends on EXPERIMENTAL && CIFS_XATTR && KEYS

	  depends on CIFS_XATTR && KEYS

	  help

	    Allows to fetch CIFS/NTFS ACL from the server.  The DACL blob

	    is handed over to the application/caller.

fs/cifs/cifs_debug.c

+10 −1
Original line number Diff line number Diff line
@@ -676,14 +676,23 @@ static ssize_t cifs_multiuser_mount_proc_write(struct file *file, 
{

	char c;

	int rc;

	static bool warned;



	rc = get_user(c, buffer);

	if (rc)

		return rc;

	if (c == '0' || c == 'n' || c == 'N')

		multiuser_mount = 0;

	else if (c == '1' || c == 'y' || c == 'Y')

	else if (c == '1' || c == 'y' || c == 'Y') {

		multiuser_mount = 1;

		if (!warned) {

			warned = true;

			printk(KERN_WARNING "CIFS VFS: The legacy multiuser "

				"mount code is scheduled to be deprecated in "

				"3.5. Please switch to using the multiuser "

				"mount option.");

		}

	}



	return count;

}

fs/cifs/cifs_spnego.c

+7 −3
Original line number Diff line number Diff line
@@ -113,9 +113,11 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo) 
		   MAX_MECH_STR_LEN +

		   UID_KEY_LEN + (sizeof(uid_t) * 2) +

		   CREDUID_KEY_LEN + (sizeof(uid_t) * 2) +

		   USER_KEY_LEN + strlen(sesInfo->user_name) +

		   PID_KEY_LEN + (sizeof(pid_t) * 2) + 1;



	if (sesInfo->user_name)

		desc_len += USER_KEY_LEN + strlen(sesInfo->user_name);



	spnego_key = ERR_PTR(-ENOMEM);

	description = kzalloc(desc_len, GFP_KERNEL);

	if (description == NULL)
@@ -152,8 +154,10 @@ cifs_get_spnego_key(struct cifs_ses *sesInfo) 
	dp = description + strlen(description);

	sprintf(dp, ";creduid=0x%x", sesInfo->cred_uid);



	if (sesInfo->user_name) {

		dp = description + strlen(description);

		sprintf(dp, ";user=%s", sesInfo->user_name);

	}



	dp = description + strlen(description);

	sprintf(dp, ";pid=0x%x", current->pid);

fs/cifs/cifs_unicode.c

+21 −20
Original line number Diff line number Diff line
@@ -27,17 +27,17 @@ 
#include "cifs_debug.h"



/*

 * cifs_ucs2_bytes - how long will a string be after conversion?

 * @ucs - pointer to input string

 * cifs_utf16_bytes - how long will a string be after conversion?

 * @utf16 - pointer to input string

 * @maxbytes - don't go past this many bytes of input string

 * @codepage - destination codepage

 *

 * Walk a ucs2le string and return the number of bytes that the string will

 * Walk a utf16le string and return the number of bytes that the string will

 * be after being converted to the given charset, not including any null

 * termination required. Don't walk past maxbytes in the source buffer.

 */

int

cifs_ucs2_bytes(const __le16 *from, int maxbytes,

cifs_utf16_bytes(const __le16 *from, int maxbytes,

		const struct nls_table *codepage)

{

	int i;
@@ -122,7 +122,7 @@ cp_convert: 
}



/*

 * cifs_from_ucs2 - convert utf16le string to local charset

 * cifs_from_utf16 - convert utf16le string to local charset

 * @to - destination buffer

 * @from - source buffer

 * @tolen - destination buffer size (in bytes)
@@ -130,7 +130,7 @@ cp_convert: 
 * @codepage - codepage to which characters should be converted

 * @mapchar - should characters be remapped according to the mapchars option?

 *

 * Convert a little-endian ucs2le string (as sent by the server) to a string

 * Convert a little-endian utf16le string (as sent by the server) to a string

 * in the provided codepage. The tolen and fromlen parameters are to ensure

 * that the code doesn't walk off of the end of the buffer (which is always

 * a danger if the alignment of the source buffer is off). The destination
@@ -139,12 +139,12 @@ cp_convert: 
 * null terminator).

 *

 * Note that some windows versions actually send multiword UTF-16 characters

 * instead of straight UCS-2. The linux nls routines however aren't able to

 * instead of straight UTF16-2. The linux nls routines however aren't able to

 * deal with those characters properly. In the event that we get some of

 * those characters, they won't be translated properly.

 */

int

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

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

		 const struct nls_table *codepage, bool mapchar)

{

	int i, charlen, safelen;
@@ -190,13 +190,13 @@ cifs_from_ucs2(char *to, const __le16 *from, int tolen, int fromlen, 
}



/*

 * NAME:	cifs_strtoUCS()

 * NAME:	cifs_strtoUTF16()

 *

 * FUNCTION:	Convert character string to unicode string

 *

 */

int

cifs_strtoUCS(__le16 *to, const char *from, int len,

cifs_strtoUTF16(__le16 *to, const char *from, int len,

	      const struct nls_table *codepage)

{

	int charlen;
@@ -206,7 +206,7 @@ cifs_strtoUCS(__le16 *to, const char *from, int len, 
	for (i = 0; len && *from; i++, from += charlen, len -= charlen) {

		charlen = codepage->char2uni(from, len, &wchar_to);

		if (charlen < 1) {

			cERROR(1, "strtoUCS: char2uni of 0x%x returned %d",

			cERROR(1, "strtoUTF16: char2uni of 0x%x returned %d",

				*from, charlen);

			/* A question mark */

			wchar_to = 0x003f;
@@ -220,7 +220,8 @@ cifs_strtoUCS(__le16 *to, const char *from, int len, 
}



/*

 * cifs_strndup_from_ucs - copy a string from wire format to the local codepage

 * cifs_strndup_from_utf16 - copy a string from wire format to the local

 * codepage

 * @src - source string

 * @maxlen - don't walk past this many bytes in the source string

 * @is_unicode - is this a unicode string?
@@ -231,19 +232,19 @@ cifs_strtoUCS(__le16 *to, const char *from, int len, 
 * error.

 */

char *

cifs_strndup_from_ucs(const char *src, const int maxlen, const bool is_unicode,

	     const struct nls_table *codepage)

cifs_strndup_from_utf16(const char *src, const int maxlen,

			const bool is_unicode, const struct nls_table *codepage)

{

	int len;

	char *dst;



	if (is_unicode) {

		len = cifs_ucs2_bytes((__le16 *) src, maxlen, codepage);

		len = cifs_utf16_bytes((__le16 *) src, maxlen, codepage);

		len += nls_nullsize(codepage);

		dst = kmalloc(len, GFP_KERNEL);

		if (!dst)

			return NULL;

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

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

			       false);

	} else {

		len = strnlen(src, maxlen);
@@ -264,7 +265,7 @@ cifs_strndup_from_ucs(const char *src, const int maxlen, const bool is_unicode, 
 * names are little endian 16 bit Unicode on the wire

 */

int

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

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

		 const struct nls_table *cp, int mapChars)

{

	int i, j, charlen;
@@ -273,7 +274,7 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen, 
	wchar_t tmp;



	if (!mapChars)

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

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



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

		src_char = source[i];
@@ -281,7 +282,7 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen, 
		switch (src_char) {

		case 0:

			put_unaligned(0, &target[j]);

			goto ctoUCS_out;

			goto ctoUTF16_out;

		case ':':

			dst_char = cpu_to_le16(UNI_COLON);

			break;
@@ -326,7 +327,7 @@ cifsConvertToUCS(__le16 *target, const char *source, int srclen, 
		put_unaligned(dst_char, &target[j]);

	}



ctoUCS_out:

ctoUTF16_out:

	return i;

}

fs/cifs/cifs_unicode.h

+10 −10
Original line number Diff line number Diff line
@@ -74,15 +74,15 @@ extern const struct UniCaseRange CifsUniLowerRange[]; 
#endif				/* UNIUPR_NOLOWER */



#ifdef __KERNEL__

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

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

		    const struct nls_table *codepage, bool mapchar);

int cifs_ucs2_bytes(const __le16 *from, int maxbytes,

int cifs_utf16_bytes(const __le16 *from, int maxbytes,

		     const struct nls_table *codepage);

int cifs_strtoUCS(__le16 *, const char *, int, const struct nls_table *);

char *cifs_strndup_from_ucs(const char *src, const int maxlen,

int cifs_strtoUTF16(__le16 *, const char *, int, const struct nls_table *);

char *cifs_strndup_from_utf16(const char *src, const int maxlen,

			      const bool is_unicode,

			      const struct nls_table *codepage);

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

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

			      const struct nls_table *cp, int mapChars);



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE