Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull cifs updates from Steve French:

 - smb3 fixes for stable

 - addition of ftrace hooks for cifs.ko

 - improvements in compounding and smbdirect (rdma)

* tag '4.18-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6: (38 commits)
  CIFS: Add support for direct pages in wdata
  CIFS: Use offset when reading pages
  CIFS: Add support for direct pages in rdata
  cifs: update multiplex loop to handle compounded responses
  cifs: remove header_preamble_size where it is always 0
  cifs: remove struct smb2_hdr
  CIFS: 511c54a2 adds a check for session expiry, status STATUS_NETWORK_SESSION_EXPIRED, however the server can also respond with STATUS_USER_SESSION_DELETED in cases where the session has been idle for some time and the server reaps the session to recover resources.
  cifs: change smb2_get_data_area_len to take a smb2_sync_hdr as argument
  cifs: update smb2_calc_size to use smb2_sync_hdr instead of smb2_hdr
  cifs: remove struct smb2_oplock_break_rsp
  cifs: remove rfc1002 header from all SMB2 response structures
  smb3: on reconnect set PreviousSessionId field
  smb3: Add posix create context for smb3.11 posix mounts
  smb3: add tracepoints for smb2/smb3 open
  cifs: add debug output to show nocase mount option
  smb3: add define for id for posix create context and corresponding struct
  cifs: update smb2_check_message to handle PDUs without a 4 byte length header
  smb3: allow "posix" mount option to enable new SMB311 protocol extensions
  smb3: add support for posix negotiate context
  cifs: allow disabling less secure legacy dialects
  ...
parents 1e43938b 8e7360f6

fs/cifs/Makefile

+4 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Makefile for Linux CIFS VFS client 

# Makefile for Linux CIFS/SMB2/SMB3 VFS client

#

ccflags-y += -I$(src)		# needed for trace events

obj-$(CONFIG_CIFS) += cifs.o



cifs-y := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o \

	  link.o misc.o netmisc.o smbencrypt.o transport.o asn1.o \

cifs-y := trace.o cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o \

	  inode.o link.o misc.o netmisc.o smbencrypt.o transport.o asn1.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 \

fs/cifs/cifs_debug.c

+26 −17
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ cifs_dump_mem(char *label, void *data, int length) 
		       data, length, true);

}



void cifs_dump_detail(void *buf)

void cifs_dump_detail(void *buf, struct TCP_Server_Info *server)

{

#ifdef CONFIG_CIFS_DEBUG2

	struct smb_hdr *smb = (struct smb_hdr *)buf;
@@ -50,7 +50,8 @@ void cifs_dump_detail(void *buf) 
	cifs_dbg(VFS, "Cmd: %d Err: 0x%x Flags: 0x%x Flgs2: 0x%x Mid: %d Pid: %d\n",

		 smb->Command, smb->Status.CifsError,

		 smb->Flags, smb->Flags2, smb->Mid, smb->Pid);

	cifs_dbg(VFS, "smb buf %p len %u\n", smb, smbCalcSize(smb));

	cifs_dbg(VFS, "smb buf %p len %u\n", smb,

		 server->ops->calc_smb_size(smb, server));

#endif /* CONFIG_CIFS_DEBUG2 */

}
@@ -83,7 +84,7 @@ void cifs_dump_mids(struct TCP_Server_Info *server) 
		cifs_dbg(VFS, "IsMult: %d IsEnd: %d\n",

			 mid_entry->multiRsp, mid_entry->multiEnd);

		if (mid_entry->resp_buf) {

			cifs_dump_detail(mid_entry->resp_buf);

			cifs_dump_detail(mid_entry->resp_buf, server);

			cifs_dump_mem("existing buf: ",

				mid_entry->resp_buf, 62);

		}
@@ -113,6 +114,8 @@ static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon) 
		seq_printf(m, " type: %d ", dev_type);

	if (tcon->seal)

		seq_printf(m, " Encrypted");

	if (tcon->nocase)

		seq_printf(m, " nocase");

	if (tcon->unix_ext)

		seq_printf(m, " POSIX Extensions");

	if (tcon->ses->server->ops->dump_share_caps)
@@ -237,6 +240,10 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
			server->credits,  server->dialect);

		if (server->sign)

			seq_printf(m, " signed");

#ifdef CONFIG_CIFS_SMB311

		if (server->posix_ext_supported)

			seq_printf(m, " posix");

#endif /* 3.1.1 */

		i++;

		list_for_each(tmp2, &server->smb_ses_list) {

			ses = list_entry(tmp2, struct cifs_ses,
@@ -489,32 +496,32 @@ cifs_proc_init(void) 
			cifs_debug_data_proc_show);



#ifdef CONFIG_CIFS_STATS

	proc_create("Stats", 0, proc_fs_cifs, &cifs_stats_proc_fops);

	proc_create("Stats", 0644, proc_fs_cifs, &cifs_stats_proc_fops);

#endif /* STATS */

	proc_create("cifsFYI", 0, proc_fs_cifs, &cifsFYI_proc_fops);

	proc_create("traceSMB", 0, proc_fs_cifs, &traceSMB_proc_fops);

	proc_create("LinuxExtensionsEnabled", 0, proc_fs_cifs,

	proc_create("cifsFYI", 0644, proc_fs_cifs, &cifsFYI_proc_fops);

	proc_create("traceSMB", 0644, proc_fs_cifs, &traceSMB_proc_fops);

	proc_create("LinuxExtensionsEnabled", 0644, proc_fs_cifs,

		    &cifs_linux_ext_proc_fops);

	proc_create("SecurityFlags", 0, proc_fs_cifs,

	proc_create("SecurityFlags", 0644, proc_fs_cifs,

		    &cifs_security_flags_proc_fops);

	proc_create("LookupCacheEnabled", 0, proc_fs_cifs,

	proc_create("LookupCacheEnabled", 0644, proc_fs_cifs,

		    &cifs_lookup_cache_proc_fops);

#ifdef CONFIG_CIFS_SMB_DIRECT

	proc_create("rdma_readwrite_threshold", 0, proc_fs_cifs,

	proc_create("rdma_readwrite_threshold", 0644, proc_fs_cifs,

		&cifs_rdma_readwrite_threshold_proc_fops);

	proc_create("smbd_max_frmr_depth", 0, proc_fs_cifs,

	proc_create("smbd_max_frmr_depth", 0644, proc_fs_cifs,

		&cifs_smbd_max_frmr_depth_proc_fops);

	proc_create("smbd_keep_alive_interval", 0, proc_fs_cifs,

	proc_create("smbd_keep_alive_interval", 0644, proc_fs_cifs,

		&cifs_smbd_keep_alive_interval_proc_fops);

	proc_create("smbd_max_receive_size", 0, proc_fs_cifs,

	proc_create("smbd_max_receive_size", 0644, proc_fs_cifs,

		&cifs_smbd_max_receive_size_proc_fops);

	proc_create("smbd_max_fragmented_recv_size", 0, proc_fs_cifs,

	proc_create("smbd_max_fragmented_recv_size", 0644, proc_fs_cifs,

		&cifs_smbd_max_fragmented_recv_size_proc_fops);

	proc_create("smbd_max_send_size", 0, proc_fs_cifs,

	proc_create("smbd_max_send_size", 0644, proc_fs_cifs,

		&cifs_smbd_max_send_size_proc_fops);

	proc_create("smbd_send_credit_target", 0, proc_fs_cifs,

	proc_create("smbd_send_credit_target", 0644, proc_fs_cifs,

		&cifs_smbd_send_credit_target_proc_fops);

	proc_create("smbd_receive_credit_max", 0, proc_fs_cifs,

	proc_create("smbd_receive_credit_max", 0644, proc_fs_cifs,

		&cifs_smbd_receive_credit_max_proc_fops);

#endif

}
@@ -572,6 +579,8 @@ static ssize_t cifsFYI_proc_write(struct file *file, const char __user *buffer, 
		cifsFYI = bv;

	else if ((c[0] > '1') && (c[0] <= '9'))

		cifsFYI = (int) (c[0] - '0'); /* see cifs_debug.h for meanings */

	else

		return -EINVAL;



	return count;

}

fs/cifs/cifs_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#define _H_CIFS_DEBUG



void cifs_dump_mem(char *label, void *data, int length);

void cifs_dump_detail(void *);

void cifs_dump_detail(void *buf, struct TCP_Server_Info *ptcp_info);

void cifs_dump_mids(struct TCP_Server_Info *);

extern bool traceSMB;		/* flag which enables the function below */

void dump_smb(void *, int);

fs/cifs/cifs_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
					      * root mountable

					      */

#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 */



struct cifs_sb_info {

	struct rb_root tlink_tree;

fs/cifs/cifsfs.c

+45 −3
Original line number Diff line number Diff line
@@ -58,13 +58,15 @@ bool traceSMB; 
bool enable_oplocks = true;

bool linuxExtEnabled = true;

bool lookupCacheEnabled = true;

bool disable_legacy_dialects; /* false by default */

unsigned int global_secflags = CIFSSEC_DEF;

/* unsigned int ntlmv2_support = 0; */

unsigned int sign_CIFS_PDUs = 1;

static const struct super_operations cifs_super_ops;

unsigned int CIFSMaxBufSize = CIFS_MAX_MSGSIZE;

module_param(CIFSMaxBufSize, uint, 0444);

MODULE_PARM_DESC(CIFSMaxBufSize, "Network buffer size (not including header). "

MODULE_PARM_DESC(CIFSMaxBufSize, "Network buffer size (not including header) "

				 "for CIFS requests. "

				 "Default: 16384 Range: 8192 to 130048");

unsigned int cifs_min_rcv = CIFS_MIN_RCV_POOL;

module_param(cifs_min_rcv, uint, 0444);
@@ -76,11 +78,21 @@ MODULE_PARM_DESC(cifs_min_small, "Small network buffers in pool. Default: 30 " 
				 "Range: 2 to 256");

unsigned int cifs_max_pending = CIFS_MAX_REQ;

module_param(cifs_max_pending, uint, 0444);

MODULE_PARM_DESC(cifs_max_pending, "Simultaneous requests to server. "

MODULE_PARM_DESC(cifs_max_pending, "Simultaneous requests to server for "

				   "CIFS/SMB1 dialect (N/A for SMB3) "

				   "Default: 32767 Range: 2 to 32767.");

module_param(enable_oplocks, bool, 0644);

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



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 "

				  "override the default dialects (SMB2.1, "

				  "SMB3 and SMB3.02) on mount with old "

				  "dialects (CIFS/SMB1 and SMB2) since "

				  "vers=1.0 (CIFS/SMB1) and vers=2.0 are weaker"

				  " and less secure. Default: n/N/0");



extern mempool_t *cifs_sm_req_poolp;

extern mempool_t *cifs_req_poolp;

extern mempool_t *cifs_mid_poolp;
@@ -469,10 +481,20 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
		seq_puts(s, ",persistenthandles");

	else if (tcon->use_resilient)

		seq_puts(s, ",resilienthandles");



#ifdef CONFIG_CIFS_SMB311

	if (tcon->posix_extensions)

		seq_puts(s, ",posix");

	else if (tcon->unix_ext)

		seq_puts(s, ",unix");

	else

		seq_puts(s, ",nounix");

#else

	if (tcon->unix_ext)

		seq_puts(s, ",unix");

	else

		seq_puts(s, ",nounix");

#endif /* SMB311 */

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)

		seq_puts(s, ",posixpaths");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID)
@@ -495,6 +517,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
		seq_puts(s, ",sfu");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL)

		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_CIFS_ACL)

		seq_puts(s, ",cifsacl");

	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM)
@@ -897,6 +921,17 @@ struct file_system_type cifs_fs_type = { 
	/*  .fs_flags */

};

MODULE_ALIAS_FS("cifs");



static struct file_system_type smb3_fs_type = {

	.owner = THIS_MODULE,

	.name = "smb3",

	.mount = cifs_do_mount,

	.kill_sb = cifs_kill_sb,

	/*  .fs_flags */

};

MODULE_ALIAS_FS("smb3");

MODULE_ALIAS("smb3");



const struct inode_operations cifs_dir_inode_ops = {

	.create = cifs_create,

	.atomic_open = cifs_atomic_open,
@@ -1435,6 +1470,12 @@ init_cifs(void) 
	if (rc)

		goto out_init_cifs_idmap;



	rc = register_filesystem(&smb3_fs_type);

	if (rc) {

		unregister_filesystem(&cifs_fs_type);

		goto out_init_cifs_idmap;

	}



	return 0;



out_init_cifs_idmap:
@@ -1465,8 +1506,9 @@ init_cifs(void) 
static void __exit

exit_cifs(void)

{

	cifs_dbg(NOISY, "exit_cifs\n");

	cifs_dbg(NOISY, "exit_smb3\n");

	unregister_filesystem(&cifs_fs_type);

	unregister_filesystem(&smb3_fs_type);

	cifs_dfs_release_automount_timer();

#ifdef CONFIG_CIFS_ACL

	exit_cifs_idmap();