Commit 772950ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SMB3 fixes from Steve French:
 "A collection of CIFS/SMB3 fixes.

  It includes a couple bug fixes, a few for improved debugging of
  cifs.ko and some improvements to the way cifs does key generation.

  I do have some additional bug fixes I expect in the next week or two
  (to address a problem found by xfstest, and some fixes for SMB3.11
  dialect, and a couple patches that just came in yesterday that I am
  reviewing)"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs_dbg() outputs an uninitialized buffer in cifs_readdir()
  cifs: fix race between call_async() and reconnect()
  Prepare for encryption support (first part). Add decryption and encryption key generation. Thanks to Metze for helping with this.
  cifs: Allow using O_DIRECT with cache=loose
  cifs: Make echo interval tunable
  cifs: Check uniqueid for SMB2+ and return -ESTALE if necessary
  Print IP address of unresponsive server
  cifs: Ratelimit kernel log messages
parents 587198ba 01b9b0b2

fs/cifs/cifs_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void cifs_vfs_err(const char *fmt, ...) 
	vaf.fmt = fmt;

	vaf.va = &args;



	pr_err("CIFS VFS: %pV", &vaf);

	pr_err_ratelimited("CIFS VFS: %pV", &vaf);



	va_end(args);

}

fs/cifs/cifs_debug.h

+4 −5
Original line number Diff line number Diff line
@@ -51,14 +51,13 @@ __printf(1, 2) void cifs_vfs_err(const char *fmt, ...); 
/* information message: e.g., configuration, major event */

#define cifs_dbg(type, fmt, ...)					\

do {									\

	if (type == FYI) {						\

		if (cifsFYI & CIFS_INFO) {				\

			pr_debug("%s: " fmt, __FILE__, ##__VA_ARGS__);	\

		}							\

	if (type == FYI && cifsFYI & CIFS_INFO) {			\

		pr_debug_ratelimited("%s: "				\

			    fmt, __FILE__, ##__VA_ARGS__);		\

	} else if (type == VFS) {					\

		cifs_vfs_err(fmt, ##__VA_ARGS__);			\

	} else if (type == NOISY && type != 0) {			\

		pr_debug(fmt, ##__VA_ARGS__);				\

		pr_debug_ratelimited(fmt, ##__VA_ARGS__);		\

	}								\

} while (0)

fs/cifs/cifsfs.c

+17 −0
Original line number Diff line number Diff line
@@ -507,6 +507,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 


	seq_printf(s, ",rsize=%u", cifs_sb->rsize);

	seq_printf(s, ",wsize=%u", cifs_sb->wsize);

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

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

	/* convert actimeo and display it in seconds */

	seq_printf(s, ",actimeo=%lu", cifs_sb->actimeo / HZ);
@@ -752,6 +754,9 @@ cifs_loose_read_iter(struct kiocb *iocb, struct iov_iter *iter) 
	ssize_t rc;

	struct inode *inode = file_inode(iocb->ki_filp);



	if (iocb->ki_filp->f_flags & O_DIRECT)

		return cifs_user_readv(iocb, iter);



	rc = cifs_revalidate_mapping(inode);

	if (rc)

		return rc;
@@ -766,6 +771,18 @@ static ssize_t cifs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	ssize_t written;

	int rc;



	if (iocb->ki_filp->f_flags & O_DIRECT) {

		written = cifs_user_writev(iocb, from);

		if (written > 0 && CIFS_CACHE_READ(cinode)) {

			cifs_zap_mapping(inode);

			cifs_dbg(FYI,

				 "Set no oplock for inode=%p after a write operation\n",

				 inode);

			cinode->oplock = 0;

		}

		return written;

	}



	written = cifs_get_writer(cinode);

	if (written)

		return written;

fs/cifs/cifsglob.h

+12 −4
Original line number Diff line number Diff line
@@ -70,8 +70,10 @@ 
#define SERVER_NAME_LENGTH 40

#define SERVER_NAME_LEN_WITH_NULL     (SERVER_NAME_LENGTH + 1)



/* SMB echo "timeout" -- FIXME: tunable? */

#define SMB_ECHO_INTERVAL (60 * HZ)

/* echo interval in seconds */

#define SMB_ECHO_INTERVAL_MIN 1

#define SMB_ECHO_INTERVAL_MAX 600

#define SMB_ECHO_INTERVAL_DEFAULT 60



#include "cifspdu.h"
@@ -225,7 +227,7 @@ struct smb_version_operations { 
	void (*print_stats)(struct seq_file *m, struct cifs_tcon *);

	void (*dump_share_caps)(struct seq_file *, struct cifs_tcon *);

	/* verify the message */

	int (*check_message)(char *, unsigned int);

	int (*check_message)(char *, unsigned int, struct TCP_Server_Info *);

	bool (*is_oplock_break)(char *, struct TCP_Server_Info *);

	void (*downgrade_oplock)(struct TCP_Server_Info *,

					struct cifsInodeInfo *, bool);
@@ -507,6 +509,7 @@ struct smb_vol { 
	struct sockaddr_storage dstaddr; /* destination address */

	struct sockaddr_storage srcaddr; /* allow binding to a local IP */

	struct nls_table *local_nls;

	unsigned int echo_interval; /* echo interval in secs */

};



#define CIFS_MOUNT_MASK (CIFS_MOUNT_NO_PERM | CIFS_MOUNT_SET_UID | \
@@ -627,7 +630,9 @@ struct TCP_Server_Info { 
#ifdef CONFIG_CIFS_SMB2

	unsigned int	max_read;

	unsigned int	max_write;

	__u8		preauth_hash[512];

#endif /* CONFIG_CIFS_SMB2 */

	unsigned long echo_interval;

};



static inline unsigned int
@@ -809,7 +814,10 @@ struct cifs_ses { 
	bool need_reconnect:1; /* connection reset, uid now invalid */

#ifdef CONFIG_CIFS_SMB2

	__u16 session_flags;

	char smb3signingkey[SMB3_SIGN_KEY_SIZE]; /* for signing smb3 packets */

	__u8 smb3signingkey[SMB3_SIGN_KEY_SIZE];

	__u8 smb3encryptionkey[SMB3_SIGN_KEY_SIZE];

	__u8 smb3decryptionkey[SMB3_SIGN_KEY_SIZE];

	__u8 preauth_hash[512];

#endif /* CONFIG_CIFS_SMB2 */

};

fs/cifs/cifsproto.h

+3 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ extern int SendReceiveBlockingLock(const unsigned int xid, 
			struct smb_hdr *out_buf,

			int *bytes_returned);

extern int cifs_reconnect(struct TCP_Server_Info *server);

extern int checkSMB(char *buf, unsigned int length);

extern int checkSMB(char *buf, unsigned int len, struct TCP_Server_Info *srvr);

extern bool is_valid_oplock_break(char *, struct TCP_Server_Info *);

extern bool backup_cred(struct cifs_sb_info *);

extern bool is_size_safe_to_change(struct cifsInodeInfo *, __u64 eof);
@@ -439,7 +439,8 @@ extern int setup_ntlm_response(struct cifs_ses *, const struct nls_table *); 
extern int setup_ntlmv2_rsp(struct cifs_ses *, const struct nls_table *);

extern void cifs_crypto_shash_release(struct TCP_Server_Info *);

extern int calc_seckey(struct cifs_ses *);

extern int generate_smb3signingkey(struct cifs_ses *);

extern int generate_smb30signingkey(struct cifs_ses *);

extern int generate_smb311signingkey(struct cifs_ses *);



#ifdef CONFIG_CIFS_WEAK_PW_HASH

extern int calc_lanman_hash(const char *password, const char *cryptkey,

CRA Git | Maintained and supported by SUSTech CRA and CCSE