Commit ae9b728c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cifs updates from Steve French:
 "Fixes (three for stable) and improvements including much faster
  encryption (SMB3.1.1 GCM)"

* tag '4.3-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6: (27 commits)
  smb3: smbdirect no longer experimental
  cifs: fix crash in smb2_compound_op()/smb2_set_next_command()
  cifs: fix crash in cifs_dfs_do_automount
  cifs: fix parsing of symbolic link error response
  cifs: refactor and clean up arguments in the reparse point parsing
  SMB3: query inode number on open via create context
  smb3: Send netname context during negotiate protocol
  smb3: do not send compression info by default
  smb3: add new mount option to retrieve mode from special ACE
  smb3: Allow query of symlinks stored as reparse points
  cifs: Fix a race condition with cifs_echo_request
  cifs: always add credits back for unsolicited PDUs
  fs: cifs: cifsssmb: Change return type of convert_ace_to_cifs_ace
  add some missing definitions
  cifs: fix typo in debug message with struct field ia_valid
  smb3: minor cleanup of compound_send_recv
  CIFS: Fix module dependency
  cifs: simplify code by removing CONFIG_CIFS_ACL ifdef
  cifs: Fix check for matching with existing mount
  cifs: Properly handle auto disabling of serverino option
  ...
parents d9b9c893 e9630660

fs/cifs/Kconfig

+6 −12
Original line number Diff line number Diff line
@@ -13,9 +13,11 @@ config CIFS 
	select CRYPTO_LIB_ARC4

	select CRYPTO_AEAD2

	select CRYPTO_CCM

	select CRYPTO_GCM

	select CRYPTO_ECB

	select CRYPTO_AES

	select CRYPTO_DES

	select KEYS

	help

	  This is the client VFS module for the SMB3 family of NAS protocols,

	  (including support for the most recent, most secure dialect SMB3.1.1)
@@ -109,7 +111,7 @@ config CIFS_WEAK_PW_HASH 


config CIFS_UPCALL

	bool "Kerberos/SPNEGO advanced session setup"

	depends on CIFS && KEYS

	depends on CIFS

	select DNS_RESOLVER

	help

	  Enables an upcall mechanism for CIFS which accesses userspace helper
@@ -144,14 +146,6 @@ config CIFS_POSIX 
	  (such as Samba 3.10 and later) which can negotiate

	  CIFS POSIX ACL support.  If unsure, say N.



config CIFS_ACL

	bool "Provide CIFS ACL support"

	depends on CIFS_XATTR && KEYS

	help

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

	  is handed over to the application/caller.  See the man

	  page for getcifsacl for more information.  If unsure, say Y.



config CIFS_DEBUG

	bool "Enable CIFS debugging routines"

	default y
@@ -184,7 +178,7 @@ config CIFS_DEBUG_DUMP_KEYS 


config CIFS_DFS_UPCALL

	bool "DFS feature support"

	depends on CIFS && KEYS

	depends on CIFS

	select DNS_RESOLVER

	help

	  Distributed File System (DFS) support is used to access shares
@@ -203,10 +197,10 @@ config CIFS_NFSD_EXPORT 
	  Allows NFS server to export a CIFS mounted share (nfsd over cifs)



config CIFS_SMB_DIRECT

	bool "SMB Direct support (Experimental)"

	bool "SMB Direct support"

	depends on CIFS=m && INFINIBAND && INFINIBAND_ADDR_TRANS || CIFS=y && INFINIBAND=y && INFINIBAND_ADDR_TRANS=y

	help

	  Enables SMB Direct experimental support for SMB 3.0, 3.02 and 3.1.1.

	  Enables SMB Direct support for SMB 3.0, 3.02 and 3.1.1.

	  SMB Direct allows transferring SMB packets over RDMA. If unsure,

	  say N.

fs/cifs/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -10,10 +10,9 @@ 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

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



cifs-$(CONFIG_CIFS_XATTR) += xattr.o

cifs-$(CONFIG_CIFS_ACL) += cifsacl.o



cifs-$(CONFIG_CIFS_UPCALL) += cifs_spnego.o

fs/cifs/cifs_debug.c

+0 −2
Original line number Diff line number Diff line
@@ -240,9 +240,7 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
#ifdef CONFIG_CIFS_XATTR

	seq_printf(m, ",XATTR");

#endif

#ifdef CONFIG_CIFS_ACL

	seq_printf(m, ",ACL");

#endif

	seq_putc(m, '\n');

	seq_printf(m, "CIFSMaxBufSize: %d\n", CIFSMaxBufSize);

	seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid);

fs/cifs/cifs_fs_sb.h

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
#define CIFS_MOUNT_UID_FROM_ACL 0x2000000 /* try to get UID via special SID */

#define CIFS_MOUNT_NO_HANDLE_CACHE 0x4000000 /* disable caching dir handles */

#define CIFS_MOUNT_NO_DFS 0x8000000 /* disable DFS resolving */

#define CIFS_MOUNT_MODE_FROM_SID 0x10000000 /* retrieve mode from special ACE */



struct cifs_sb_info {

	struct rb_root tlink_tree;
@@ -83,5 +84,10 @@ struct cifs_sb_info { 
	 * failover properly.

	 */

	char *origin_fullpath; /* \\HOST\SHARE\[OPTIONAL PATH] */

	/*

	 * Indicate whether serverino option was turned off later

	 * (cifs_autodisable_serverino) in order to match new mounts.

	 */

	bool mnt_cifs_serverino_autodisabled;

};

#endif				/* _CIFS_FS_SB_H */

fs/cifs/cifsfs.c

+8 −6
Original line number Diff line number Diff line
@@ -526,6 +526,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
		seq_puts(s, ",nobrl");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_HANDLE_CACHE)

		seq_puts(s, ",nohandlecache");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MODE_FROM_SID)

		seq_puts(s, ",modefromsid");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL)

		seq_puts(s, ",cifsacl");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM)
@@ -554,6 +556,11 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
	seq_printf(s, ",bsize=%u", cifs_sb->bsize);

	seq_printf(s, ",echo_interval=%lu",

			tcon->ses->server->echo_interval / HZ);



	/* Only display max_credits if it was overridden on mount */

	if (tcon->ses->server->max_credits != SMB2_MAX_CREDITS_AVAILABLE)

		seq_printf(s, ",max_credits=%u", tcon->ses->server->max_credits);



	if (tcon->snapshot_time)

		seq_printf(s, ",snapshot=%llu", tcon->snapshot_time);

	if (tcon->handle_timeout)
@@ -1517,11 +1524,9 @@ init_cifs(void) 
		goto out_destroy_dfs_cache;

#endif /* CONFIG_CIFS_UPCALL */



#ifdef CONFIG_CIFS_ACL

	rc = init_cifs_idmap();

	if (rc)

		goto out_register_key_type;

#endif /* CONFIG_CIFS_ACL */



	rc = register_filesystem(&cifs_fs_type);

	if (rc)
@@ -1536,10 +1541,8 @@ init_cifs(void) 
	return 0;



out_init_cifs_idmap:

#ifdef CONFIG_CIFS_ACL

	exit_cifs_idmap();

out_register_key_type:

#endif

#ifdef CONFIG_CIFS_UPCALL

	exit_cifs_spnego();

out_destroy_dfs_cache:
@@ -1571,9 +1574,7 @@ exit_cifs(void) 
	unregister_filesystem(&cifs_fs_type);

	unregister_filesystem(&smb3_fs_type);

	cifs_dfs_release_automount_timer();

#ifdef CONFIG_CIFS_ACL

	exit_cifs_idmap();

#endif

#ifdef CONFIG_CIFS_UPCALL

	exit_cifs_spnego();

#endif
@@ -1607,5 +1608,6 @@ MODULE_SOFTDEP("pre: sha256"); 
MODULE_SOFTDEP("pre: sha512");

MODULE_SOFTDEP("pre: aead2");

MODULE_SOFTDEP("pre: ccm");

MODULE_SOFTDEP("pre: gcm");

module_init(init_cifs)

module_exit(exit_cifs)

CRA Git | Maintained and supported by SUSTech CRA and CCSE