Commit 94521ca3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull CIFS/SMB3 updates from Steve French:
 "Includes two bug fixes, as well as (minimal) support for the new
  protocol dialect (SMB3.1.1), and support for two ioctls including
  reflink (duplicate extents) file copy and set integrity"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Unset CIFS_MOUNT_POSIX_PATHS flag when following dfs mounts
  Update negotiate protocol for SMB3.11 dialect
  Add ioctl to set integrity
  Add Get/Set Integrity Information structure definitions
  Add reflink copy over SMB3.11 with new FSCTL_DUPLICATE_EXTENTS
  Add SMB3.11 mount option synonym for new dialect
  add struct FILE_STANDARD_INFO
  Make dialect negotiation warning message easier to read
  Add defines and structs for smb3.1 dialect
  Allow parsing vers=3.11 on cifs mount
  client MUST ignore EncryptionKeyLength if CAP_EXTENDED_SECURITY is set
parents 68b4449d 1dfd18d0

fs/cifs/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -192,6 +192,15 @@ config CIFS_SMB2 
	  options are also slightly simpler (compared to CIFS) due

	  to protocol improvements.



config CIFS_SMB311

	bool "SMB3.1.1 network file system support (Experimental)"

	depends on CIFS_SMB2 && INET



	help

	  This enables experimental support for the newest, SMB3.1.1, dialect.

	  This dialect includes improved security negotiation features.

	  If unsure, say N



config CIFS_FSCACHE

	  bool "Provide CIFS client caching support"

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

fs/cifs/cifsglob.h

+13 −0
Original line number Diff line number Diff line
@@ -171,6 +171,10 @@ enum smb_version { 
	Smb_21,

	Smb_30,

	Smb_302,

#ifdef CONFIG_CIFS_SMB311

	Smb_311,

#endif /* SMB311 */

	Smb_version_err

};



struct mid_q_entry;
@@ -368,6 +372,8 @@ struct smb_version_operations { 
	void (*new_lease_key)(struct cifs_fid *);

	int (*generate_signingkey)(struct cifs_ses *);

	int (*calc_signature)(struct smb_rqst *, struct TCP_Server_Info *);

	int (*set_integrity)(const unsigned int, struct cifs_tcon *tcon,

			     struct cifsFileInfo *src_file);

	int (*query_mf_symlink)(unsigned int, struct cifs_tcon *,

				struct cifs_sb_info *, const unsigned char *,

				char *, unsigned int *);
@@ -386,6 +392,9 @@ struct smb_version_operations { 
	int (*clone_range)(const unsigned int, struct cifsFileInfo *src_file,

			struct cifsFileInfo *target_file, u64 src_off, u64 len,

			u64 dest_off);

	int (*duplicate_extents)(const unsigned int, struct cifsFileInfo *src,

			struct cifsFileInfo *target_file, u64 src_off, u64 len,

			u64 dest_off);

	int (*validate_negotiate)(const unsigned int, struct cifs_tcon *);

	ssize_t (*query_all_EAs)(const unsigned int, struct cifs_tcon *,

			const unsigned char *, const unsigned char *, char *,
@@ -1617,4 +1626,8 @@ extern struct smb_version_values smb30_values; 
#define SMB302_VERSION_STRING	"3.02"

/*extern struct smb_version_operations smb302_operations;*/ /* not needed yet */

extern struct smb_version_values smb302_values;

#define SMB311_VERSION_STRING	"3.1.1"

#define ALT_SMB311_VERSION_STRING "3.11"

extern struct smb_version_operations smb311_operations;

extern struct smb_version_values smb311_values;

#endif	/* _CIFS_GLOB_H */

fs/cifs/cifspdu.h

+12 −0
Original line number Diff line number Diff line
@@ -2255,6 +2255,8 @@ typedef struct { 




/* List of FileSystemAttributes - see 2.5.1 of MS-FSCC */

#define FILE_SUPPORTS_SPARSE_VDL	0x10000000 /* faster nonsparse extend */

#define FILE_SUPPORTS_BLOCK_REFCOUNTING	0x08000000 /* allow ioctl dup extents */

#define FILE_SUPPORT_INTEGRITY_STREAMS	0x04000000

#define FILE_SUPPORTS_USN_JOURNAL	0x02000000

#define FILE_SUPPORTS_OPEN_BY_FILE_ID	0x01000000
@@ -2310,6 +2312,16 @@ typedef struct { /* data block encoding of response to level 263 QPathInfo */ 
	char FileName[1];

} __attribute__((packed)) FILE_ALL_INFO;	/* level 0x107 QPathInfo */



typedef struct {

	__le64 AllocationSize;

	__le64 EndOfFile;	/* size ie offset to first free byte in file */

	__le32 NumberOfLinks;	/* hard links */

	__u8 DeletePending;

	__u8 Directory;

	__u16 Pad;

} __attribute__((packed)) FILE_STANDARD_INFO;	/* level 0x102 QPathInfo */





/* defines for enumerating possible values of the Unix type field below */

#define UNIX_FILE      0

#define UNIX_DIR       1

fs/cifs/cifssmb.c

+2 −3
Original line number Diff line number Diff line
@@ -625,9 +625,8 @@ CIFSSMBNegotiate(const unsigned int xid, struct cifs_ses *ses) 
		server->negflavor = CIFS_NEGFLAVOR_UNENCAP;

		memcpy(ses->server->cryptkey, pSMBr->u.EncryptionKey,

		       CIFS_CRYPTO_KEY_SIZE);

	} else if ((pSMBr->hdr.Flags2 & SMBFLG2_EXT_SEC ||

			server->capabilities & CAP_EXTENDED_SECURITY) &&

				(pSMBr->EncryptionKeyLength == 0)) {

	} else if (pSMBr->hdr.Flags2 & SMBFLG2_EXT_SEC ||

			server->capabilities & CAP_EXTENDED_SECURITY) {

		server->negflavor = CIFS_NEGFLAVOR_EXTENDED;

		rc = decode_ext_sec_blob(ses, pSMBr);

	} else if (server->sec_mode & SECMODE_PW_ENCRYPT) {

fs/cifs/connect.c

+13 −0
Original line number Diff line number Diff line
@@ -280,6 +280,11 @@ static const match_table_t cifs_smb_version_tokens = { 
	{ Smb_21, SMB21_VERSION_STRING },

	{ Smb_30, SMB30_VERSION_STRING },

	{ Smb_302, SMB302_VERSION_STRING },

#ifdef CONFIG_CIFS_SMB311

	{ Smb_311, SMB311_VERSION_STRING },

	{ Smb_311, ALT_SMB311_VERSION_STRING },

#endif /* SMB311 */

	{ Smb_version_err, NULL }

};



static int ip_connect(struct TCP_Server_Info *server);
@@ -1133,6 +1138,12 @@ cifs_parse_smb_version(char *value, struct smb_vol *vol) 
		vol->ops = &smb30_operations; /* currently identical with 3.0 */

		vol->vals = &smb302_values;

		break;

#ifdef CONFIG_CIFS_SMB311

	case Smb_311:

		vol->ops = &smb311_operations;

		vol->vals = &smb311_values;

		break;

#endif /* SMB311 */

#endif

	default:

		cifs_dbg(VFS, "Unknown vers= option specified: %s\n", value);
@@ -3461,6 +3472,8 @@ try_mount_again: 
		else if (ses)

			cifs_put_smb_ses(ses);



		cifs_sb->mnt_cifs_flags &= ~CIFS_MOUNT_POSIX_PATHS;



		free_xid(xid);

	}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE