Commit 21b26d26 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull cifs updates from Steve French:
 "Various smb3 fixes (including 12 for stable) and also features
  (addition of multichannel support)"

* tag '5.5-rc-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6: (41 commits)
  CIFS: fix a white space issue in cifs_get_inode_info()
  cifs: update internal module version number
  cifs: Always update signing key of first channel
  cifs: Fix retrieval of DFS referrals in cifs_mount()
  cifs: Fix potential softlockups while refreshing DFS cache
  cifs: Fix lookup of root ses in DFS referral cache
  cifs: Fix use-after-free bug in cifs_reconnect()
  cifs: dump channel info in DebugData
  smb3: dump in_send and num_waiters stats counters by default
  cifs: try harder to open new channels
  CIFS: Properly process SMB3 lease breaks
  cifs: move cifsFileInfo_put logic into a work-queue
  cifs: try opening channels after mounting
  CIFS: refactor cifs_get_inode_info()
  cifs: switch servers depending on binding state
  cifs: add server param
  cifs: add multichannel mount options and data structs
  cifs: sort interface list by speed
  CIFS: Fix SMB2 oplock break processing
  cifs: don't use 'pre:' for MODULE_SOFTDEP
  ...
parents 8f45533e 68464b88

fs/cifs/cifs_debug.c

+40 −3
Original line number Diff line number Diff line
@@ -121,6 +121,27 @@ static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon) 
	seq_putc(m, '\n');

}



static void

cifs_dump_channel(struct seq_file *m, int i, struct cifs_chan *chan)

{

	struct TCP_Server_Info *server = chan->server;



	seq_printf(m, "\t\tChannel %d Number of credits: %d Dialect 0x%x "

		   "TCP status: %d Instance: %d Local Users To Server: %d "

		   "SecMode: 0x%x Req On Wire: %d In Send: %d "

		   "In MaxReq Wait: %d\n",

		   i+1,

		   server->credits,

		   server->dialect,

		   server->tcpStatus,

		   server->reconnect_instance,

		   server->srv_count,

		   server->sec_mode,

		   in_flight(server),

		   atomic_read(&server->in_send),

		   atomic_read(&server->num_waiters));

}



static void

cifs_dump_iface(struct seq_file *m, struct cifs_server_iface *iface)

{
@@ -256,6 +277,11 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) 
		if (!server->rdma)

			goto skip_rdma;



		if (!server->smbd_conn) {

			seq_printf(m, "\nSMBDirect transport not available");

			goto skip_rdma;

		}



		seq_printf(m, "\nSMBDirect (in hex) protocol version: %x "

			"transport status: %x",

			server->smbd_conn->protocol,
@@ -360,11 +386,10 @@ skip_rdma: 
				   server->srv_count,

				   server->sec_mode, in_flight(server));



#ifdef CONFIG_CIFS_STATS2

			seq_printf(m, " In Send: %d In MaxReq Wait: %d",

				atomic_read(&server->in_send),

				atomic_read(&server->num_waiters));

#endif



			/* dump session id helpful for use with network trace */

			seq_printf(m, " SessionId: 0x%llx", ses->Suid);

			if (ses->session_flags & SMB2_SESSION_FLAG_ENCRYPT_DATA)
@@ -372,6 +397,13 @@ skip_rdma: 
			if (ses->sign)

				seq_puts(m, " signed");



			if (ses->chan_count > 1) {

				seq_printf(m, "\n\n\tExtra Channels: %zu\n",

					   ses->chan_count-1);

				for (j = 1; j < ses->chan_count; j++)

					cifs_dump_channel(m, j, &ses->chans[j]);

			}



			seq_puts(m, "\n\tShares:");

			j = 0;
@@ -410,8 +442,13 @@ skip_rdma: 
				seq_printf(m, "\n\tServer interfaces: %zu\n",

					   ses->iface_count);

			for (j = 0; j < ses->iface_count; j++) {

				struct cifs_server_iface *iface;



				iface = &ses->iface_list[j];

				seq_printf(m, "\t%d)", j);

				cifs_dump_iface(m, &ses->iface_list[j]);

				cifs_dump_iface(m, iface);

				if (is_ses_using_iface(ses, iface))

					seq_puts(m, "\t\t[CONNECTED]\n");

			}

			spin_unlock(&ses->iface_lock);

		}

fs/cifs/cifs_spnego.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct key_type cifs_spnego_key_type = { 
struct key *

cifs_get_spnego_key(struct cifs_ses *sesInfo)

{

	struct TCP_Server_Info *server = sesInfo->server;

	struct TCP_Server_Info *server = cifs_ses_server(sesInfo);

	struct sockaddr_in *sa = (struct sockaddr_in *) &server->dstaddr;

	struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) &server->dstaddr;

	char *description, *dp;

fs/cifs/cifsacl.c

+0 −2
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ static const struct cifs_sid sid_everyone = { 
/* security id for Authenticated Users system group */

static const struct cifs_sid sid_authusers = {

	1, 1, {0, 0, 0, 0, 0, 5}, {cpu_to_le32(11)} };

/* group users */

static const struct cifs_sid sid_user = {1, 2 , {0, 0, 0, 0, 0, 5}, {} };



/* S-1-22-1 Unmapped Unix users */

static const struct cifs_sid sid_unix_users = {1, 1, {0, 0, 0, 0, 0, 22},

fs/cifs/cifsfs.c

+31 −13
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ extern mempool_t *cifs_mid_poolp; 


struct workqueue_struct	*cifsiod_wq;

struct workqueue_struct	*decrypt_wq;

struct workqueue_struct	*fileinfo_put_wq;

struct workqueue_struct	*cifsoplockd_wq;

__u32 cifs_lock_secret;
@@ -613,6 +614,10 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
	/* convert actimeo and display it in seconds */

	seq_printf(s, ",actimeo=%lu", cifs_sb->actimeo / HZ);



	if (tcon->ses->chan_max > 1)

		seq_printf(s, ",multichannel,max_channel=%zu",

			   tcon->ses->chan_max);



	return 0;

}
@@ -1219,6 +1224,7 @@ const struct file_operations cifs_file_ops = { 
	.open = cifs_open,

	.release = cifs_close,

	.lock = cifs_lock,

	.flock = cifs_flock,

	.fsync = cifs_fsync,

	.flush = cifs_flush,

	.mmap  = cifs_file_mmap,
@@ -1238,6 +1244,7 @@ const struct file_operations cifs_file_strict_ops = { 
	.open = cifs_open,

	.release = cifs_close,

	.lock = cifs_lock,

	.flock = cifs_flock,

	.fsync = cifs_strict_fsync,

	.flush = cifs_flush,

	.mmap = cifs_file_strict_mmap,
@@ -1257,6 +1264,7 @@ const struct file_operations cifs_file_direct_ops = { 
	.open = cifs_open,

	.release = cifs_close,

	.lock = cifs_lock,

	.flock = cifs_flock,

	.fsync = cifs_fsync,

	.flush = cifs_flush,

	.mmap = cifs_file_mmap,
@@ -1554,11 +1562,18 @@ init_cifs(void) 
		goto out_destroy_cifsiod_wq;

	}



	fileinfo_put_wq = alloc_workqueue("cifsfileinfoput",

				     WQ_UNBOUND|WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);

	if (!fileinfo_put_wq) {

		rc = -ENOMEM;

		goto out_destroy_decrypt_wq;

	}



	cifsoplockd_wq = alloc_workqueue("cifsoplockd",

					 WQ_FREEZABLE|WQ_MEM_RECLAIM, 0);

	if (!cifsoplockd_wq) {

		rc = -ENOMEM;

		goto out_destroy_decrypt_wq;

		goto out_destroy_fileinfo_put_wq;

	}



	rc = cifs_fscache_register();
@@ -1624,6 +1639,8 @@ out_unreg_fscache: 
	cifs_fscache_unregister();

out_destroy_cifsoplockd_wq:

	destroy_workqueue(cifsoplockd_wq);

out_destroy_fileinfo_put_wq:

	destroy_workqueue(fileinfo_put_wq);

out_destroy_decrypt_wq:

	destroy_workqueue(decrypt_wq);

out_destroy_cifsiod_wq:
@@ -1653,6 +1670,7 @@ exit_cifs(void) 
	cifs_fscache_unregister();

	destroy_workqueue(cifsoplockd_wq);

	destroy_workqueue(decrypt_wq);

	destroy_workqueue(fileinfo_put_wq);

	destroy_workqueue(cifsiod_wq);

	cifs_proc_clean();

}
@@ -1663,17 +1681,17 @@ MODULE_DESCRIPTION 
	("VFS to access SMB3 servers e.g. Samba, Macs, Azure and Windows (and "

	"also older servers complying with the SNIA CIFS Specification)");

MODULE_VERSION(CIFS_VERSION);

MODULE_SOFTDEP("pre: ecb");

MODULE_SOFTDEP("pre: hmac");

MODULE_SOFTDEP("pre: md4");

MODULE_SOFTDEP("pre: md5");

MODULE_SOFTDEP("pre: nls");

MODULE_SOFTDEP("pre: aes");

MODULE_SOFTDEP("pre: cmac");

MODULE_SOFTDEP("pre: sha256");

MODULE_SOFTDEP("pre: sha512");

MODULE_SOFTDEP("pre: aead2");

MODULE_SOFTDEP("pre: ccm");

MODULE_SOFTDEP("pre: gcm");

MODULE_SOFTDEP("ecb");

MODULE_SOFTDEP("hmac");

MODULE_SOFTDEP("md4");

MODULE_SOFTDEP("md5");

MODULE_SOFTDEP("nls");

MODULE_SOFTDEP("aes");

MODULE_SOFTDEP("cmac");

MODULE_SOFTDEP("sha256");

MODULE_SOFTDEP("sha512");

MODULE_SOFTDEP("aead2");

MODULE_SOFTDEP("ccm");

MODULE_SOFTDEP("gcm");

module_init(init_cifs)

module_exit(exit_cifs)

fs/cifs/cifsfs.h

+2 −1
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ extern ssize_t cifs_strict_readv(struct kiocb *iocb, struct iov_iter *to); 
extern ssize_t cifs_user_writev(struct kiocb *iocb, struct iov_iter *from);

extern ssize_t cifs_direct_writev(struct kiocb *iocb, struct iov_iter *from);

extern ssize_t cifs_strict_writev(struct kiocb *iocb, struct iov_iter *from);

extern int cifs_flock(struct file *pfile, int cmd, struct file_lock *plock);

extern int cifs_lock(struct file *, int, struct file_lock *);

extern int cifs_fsync(struct file *, loff_t, loff_t, int);

extern int cifs_strict_fsync(struct file *, loff_t, loff_t, int);
@@ -152,5 +153,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); 
extern const struct export_operations cifs_export_ops;

#endif /* CONFIG_CIFS_NFSD_EXPORT */



#define CIFS_VERSION   "2.23"

#define CIFS_VERSION   "2.24"

#endif				/* _CIFSFS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE