Commit 0613ed91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.10-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs updates from Steve French:

 - add support for recognizing special file types (char/block/fifo/
   symlink) for files created by Linux on WSL (a format we plan to move
   to as the default for creating special files on Linux, as it has
   advantages over the other current option, the SFU format) in readdir.

 - fix double queries to root directory when directory leases not
   supported (e.g. Samba)

 - fix querying mode bits (modefromsid mount option) for special file
   types

 - stronger encryption (gcm256), disabled by default until tested more
   broadly

 - allow querying owner when server reports 'well known SID' on query
   dir with SMB3.1.1 POSIX extensions

* tag '5.10-rc-smb3-fixes-part1' of git://git.samba.org/sfrench/cifs-2.6: (30 commits)
  SMB3: add support for recognizing WSL reparse tags
  cifs: remove bogus debug code
  smb3.1.1: fix typo in compression flag
  cifs: move smb version mount options into fs_context.c
  cifs: move cache mount options to fs_context.ch
  cifs: move security mount options into fs_context.ch
  cifs: add files to host new mount api
  smb3: do not try to cache root directory if dir leases not supported
  smb3: fix stat when special device file and mounted with modefromsid
  cifs: Print the address and port we are connecting to in generic_ip_connect()
  SMB3: Resolve data corruption of TCP server info fields
  cifs: make const array static, makes object smaller
  SMB3.1.1: Fix ids returned in POSIX query dir
  smb3: add dynamic trace point to trace when credits obtained
  smb3.1.1: do not fail if no encryption required but server doesn't support it
  cifs: Return the error from crypt_message when enc/dec key not found.
  smb3.1.1: set gcm256 when requested
  smb3.1.1: rename nonces used for GCM and CCM encryption
  smb3.1.1: print warning if server does not support requested encryption type
  smb3.1.1: add new module load parm enable_gcm_256
  ...
parents c4728cfb 13909d96

fs/cifs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ cifs-y := trace.o cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o \ 
	  cifs_unicode.o nterr.o cifsencrypt.o \

	  readdir.o ioctl.o sess.o export.o smb1ops.o winucase.o \

	  smb2ops.o smb2maperror.o smb2transport.o \

	  smb2misc.o smb2pdu.o smb2inode.o smb2file.o cifsacl.o

	  smb2misc.o smb2pdu.o smb2inode.o smb2file.o cifsacl.o fs_context.o



cifs-$(CONFIG_CIFS_XATTR) += xattr.o

fs/cifs/asn1.c

+8 −8
Original line number Diff line number Diff line
@@ -530,8 +530,8 @@ decode_negTokenInit(unsigned char *security_blob, int length, 
		return 0;

	} else if ((cls != ASN1_CTX) || (con != ASN1_CON)

		   || (tag != ASN1_EOC)) {

		cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p (%d) exit 0\n",

			 cls, con, tag, end, *end);

		cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p exit 0\n",

			 cls, con, tag, end);

		return 0;

	}
@@ -541,8 +541,8 @@ decode_negTokenInit(unsigned char *security_blob, int length, 
		return 0;

	} else if ((cls != ASN1_UNI) || (con != ASN1_CON)

		   || (tag != ASN1_SEQ)) {

		cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p (%d) exit 1\n",

			 cls, con, tag, end, *end);

		cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p exit 1\n",

			 cls, con, tag, end);

		return 0;

	}
@@ -552,8 +552,8 @@ decode_negTokenInit(unsigned char *security_blob, int length, 
		return 0;

	} else if ((cls != ASN1_CTX) || (con != ASN1_CON)

		   || (tag != ASN1_EOC)) {

		cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p (%d) exit 0\n",

			 cls, con, tag, end, *end);

		cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p exit 0\n",

			 cls, con, tag, end);

		return 0;

	}
@@ -564,8 +564,8 @@ decode_negTokenInit(unsigned char *security_blob, int length, 
		return 0;

	} else if ((cls != ASN1_UNI) || (con != ASN1_CON)

		   || (tag != ASN1_SEQ)) {

		cifs_dbg(FYI, "cls = %d con = %d tag = %d end = %p (%d) exit 1\n",

			 cls, con, tag, end, *end);

		cifs_dbg(FYI, "cls = %d con = %d tag = %d sequence_end = %p exit 1\n",

			 cls, con, tag, sequence_end);

		return 0;

	}

fs/cifs/cifs_unicode.c

+7 −1
Original line number Diff line number Diff line
@@ -488,7 +488,13 @@ cifsConvertToUTF16(__le16 *target, const char *source, int srclen, 
		else if (map_chars == SFM_MAP_UNI_RSVD) {

			bool end_of_string;



			if (i == srclen - 1)

			/**

			 * Remap spaces and periods found at the end of every

			 * component of the path. The special cases of '.' and

			 * '..' do not need to be dealt with explicitly because

			 * they are addressed in namei.c:link_path_walk().

			 **/

			if ((i == srclen - 1) || (source[i+1] == '\\'))

				end_of_string = true;

			else

				end_of_string = false;

fs/cifs/cifsacl.c

+3 −2
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ invalidate_key: 
	goto out_key_put;

}



static int

int

sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid,

		struct cifs_fattr *fattr, uint sidtype)

{
@@ -359,7 +359,8 @@ sid_to_id(struct cifs_sb_info *cifs_sb, struct cifs_sid *psid, 
		return -EIO;

	}



	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UID_FROM_ACL) {

	if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UID_FROM_ACL) ||

	    (cifs_sb_master_tcon(cifs_sb)->posix_extensions)) {

		uint32_t unix_id;

		bool is_group;

fs/cifs/cifsfs.c

+8 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ bool enable_oplocks = true; 
bool linuxExtEnabled = true;

bool lookupCacheEnabled = true;

bool disable_legacy_dialects; /* false by default */

bool enable_gcm_256;  /* false by default, change when more servers support it */

bool require_gcm_256; /* false by default */

unsigned int global_secflags = CIFSSEC_DEF;

/* unsigned int ntlmv2_support = 0; */

unsigned int sign_CIFS_PDUs = 1;
@@ -104,6 +106,12 @@ MODULE_PARM_DESC(slow_rsp_threshold, "Amount of time (in seconds) to wait " 
module_param(enable_oplocks, bool, 0644);

MODULE_PARM_DESC(enable_oplocks, "Enable or disable oplocks. Default: y/Y/1");



module_param(enable_gcm_256, bool, 0644);

MODULE_PARM_DESC(enable_gcm_256, "Enable requesting strongest (256 bit) GCM encryption. Default: n/N/0");



module_param(require_gcm_256, bool, 0644);

MODULE_PARM_DESC(require_gcm_256, "Require strongest (256 bit) GCM encryption. Default: n/N/0");



module_param(disable_legacy_dialects, bool, 0644);

MODULE_PARM_DESC(disable_legacy_dialects, "To improve security it may be "

				  "helpful to restrict the ability to "

CRA Git | Maintained and supported by SUSTech CRA and CCSE