Commit 9a005bea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more cifs updates from Steve French:

 - three fixes for big endian issues in how Persistent and Volatile file
   ids were stored

 - Various misc. fixes: including some for oops, 2 for ioctls, 1 for
   writeback

 - cleanup of how tcon (tree connection) status is tracked

 - Four changesets to move various duplicated protocol definitions
   (defined both in cifs.ko and ksmbd) into smbfs_common/smb2pdu.h

 - important performance improvement to use cached handles in some key
   compounding code paths (reduces numbers of opens/closes sent in some
   workloads)

 - fix to allow alternate DFS target to be used to retry on a failed i/o

* tag '5.18-smb3-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix NULL ptr dereference in smb2_ioctl_query_info()
  cifs: prevent bad output lengths in smb2_ioctl_query_info()
  smb3: fix ksmbd bigendian bug in oplock break, and move its struct to smbfs_common
  smb3: cleanup and clarify status of tree connections
  smb3: move defines for query info and query fsinfo to smbfs_common
  smb3: move defines for ioctl protocol header and SMB2 sizes to smbfs_common
  [smb3] move more common protocol header definitions to smbfs_common
  cifs: fix incorrect use of list iterator after the loop
  ksmbd: store fids as opaque u64 integers
  cifs: fix bad fids sent over wire
  cifs: change smb2_query_info_compound to use a cached fid, if available
  cifs: convert the path to utf16 in smb2_query_info_compound
  cifs: writeback fix
  cifs: do not skip link targets when an I/O fails
parents ec251f3e d6f5e358

fs/cifs/cifs_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void cifs_debug_tcon(struct seq_file *m, struct cifs_tcon *tcon) 
		   le32_to_cpu(tcon->fsDevInfo.DeviceCharacteristics),

		   le32_to_cpu(tcon->fsAttrInfo.Attributes),

		   le32_to_cpu(tcon->fsAttrInfo.MaxPathNameComponentLength),

		   tcon->tidStatus);

		   tcon->status);

	if (dev_type == FILE_DEVICE_DISK)

		seq_puts(m, " type: DISK ");

	else if (dev_type == FILE_DEVICE_CD_ROM)

fs/cifs/cifsfs.c

+2 −2
Original line number Diff line number Diff line
@@ -699,14 +699,14 @@ static void cifs_umount_begin(struct super_block *sb) 
	tcon = cifs_sb_master_tcon(cifs_sb);



	spin_lock(&cifs_tcp_ses_lock);

	if ((tcon->tc_count > 1) || (tcon->tidStatus == CifsExiting)) {

	if ((tcon->tc_count > 1) || (tcon->status == TID_EXITING)) {

		/* we have other mounts to same share or we have

		   already tried to force umount this and woken up

		   all waiting network requests, nothing to do */

		spin_unlock(&cifs_tcp_ses_lock);

		return;

	} else if (tcon->tc_count == 1)

		tcon->tidStatus = CifsExiting;

		tcon->status = TID_EXITING;

	spin_unlock(&cifs_tcp_ses_lock);



	/* cancel_brl_requests(tcon); */ /* BB mark all brl mids as exiting */

fs/cifs/cifsglob.h

+13 −11
Original line number Diff line number Diff line
@@ -116,10 +116,18 @@ enum statusEnum { 
	CifsInNegotiate,

	CifsNeedSessSetup,

	CifsInSessSetup,

	CifsNeedTcon,

	CifsInTcon,

	CifsNeedFilesInvalidate,

	CifsInFilesInvalidate

};



/* associated with each tree connection to the server */

enum tid_status_enum {

	TID_NEW = 0,

	TID_GOOD,

	TID_EXITING,

	TID_NEED_RECON,

	TID_NEED_TCON,

	TID_IN_TCON,

	TID_NEED_FILES_INVALIDATE, /* currently unused */

	TID_IN_FILES_INVALIDATE

};



enum securityEnum {
@@ -853,13 +861,7 @@ compare_mid(__u16 mid, const struct smb_hdr *smb) 
#define CIFS_MAX_RFC1002_WSIZE ((1<<17) - 1 - sizeof(WRITE_REQ) + 4)

#define CIFS_MAX_RFC1002_RSIZE ((1<<17) - 1 - sizeof(READ_RSP) + 4)



/*

 * The default wsize is 1M. find_get_pages seems to return a maximum of 256

 * pages in a single call. With PAGE_SIZE == 4k, this means we can fill

 * a single wsize request with a single call.

 */

#define CIFS_DEFAULT_IOSIZE (1024 * 1024)

#define SMB3_DEFAULT_IOSIZE (4 * 1024 * 1024)



/*

 * Windows only supports a max of 60kb reads and 65535 byte writes. Default to
@@ -1039,7 +1041,7 @@ struct cifs_tcon { 
	char *password;		/* for share-level security */

	__u32 tid;		/* The 4 byte tree id */

	__u16 Flags;		/* optional support bits */

	enum statusEnum tidStatus;

	enum tid_status_enum status;

	atomic_t num_smbs_sent;

	union {

		struct {

fs/cifs/cifspdu.h

+1 −13
Original line number Diff line number Diff line
@@ -123,18 +123,6 @@ 
 */

#define CIFS_SESS_KEY_SIZE (16)



/*

 * Size of the smb3 signing key

 */

#define SMB3_SIGN_KEY_SIZE (16)



/*

 * Size of the smb3 encryption/decryption key storage.

 * This size is big enough to store any cipher key types.

 */

#define SMB3_ENC_DEC_KEY_SIZE (32)



#define CIFS_CLIENT_CHALLENGE_SIZE (8)

#define CIFS_SERVER_CHALLENGE_SIZE (8)

#define CIFS_HMAC_MD5_HASH_SIZE (16)

#define CIFS_CPHTXT_SIZE (16)
@@ -1658,7 +1646,7 @@ struct smb_t2_rsp { 
#define SMB_FIND_FILE_ID_FULL_DIR_INFO    0x105

#define SMB_FIND_FILE_ID_BOTH_DIR_INFO    0x106

#define SMB_FIND_FILE_UNIX                0x202

#define SMB_FIND_FILE_POSIX_INFO          0x064

/* #define SMB_FIND_FILE_POSIX_INFO          0x064 */



typedef struct smb_com_transaction2_qpi_req {

	struct smb_hdr hdr;	/* wct = 14+ */

fs/cifs/cifssmb.c

+5 −6
Original line number Diff line number Diff line
@@ -75,12 +75,11 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon) 


	/* only send once per connect */

	spin_lock(&cifs_tcp_ses_lock);

	if (tcon->ses->status != CifsGood ||

	    tcon->tidStatus != CifsNeedReconnect) {

	if ((tcon->ses->status != CifsGood) || (tcon->status != TID_NEED_RECON)) {

		spin_unlock(&cifs_tcp_ses_lock);

		return;

	}

	tcon->tidStatus = CifsInFilesInvalidate;

	tcon->status = TID_IN_FILES_INVALIDATE;

	spin_unlock(&cifs_tcp_ses_lock);



	/* list all files open on tree connection and mark them invalid */
@@ -100,8 +99,8 @@ cifs_mark_open_files_invalid(struct cifs_tcon *tcon) 
	mutex_unlock(&tcon->crfid.fid_mutex);



	spin_lock(&cifs_tcp_ses_lock);

	if (tcon->tidStatus == CifsInFilesInvalidate)

		tcon->tidStatus = CifsNeedTcon;

	if (tcon->status == TID_IN_FILES_INVALIDATE)

		tcon->status = TID_NEED_TCON;

	spin_unlock(&cifs_tcp_ses_lock);



	/*
@@ -136,7 +135,7 @@ cifs_reconnect_tcon(struct cifs_tcon *tcon, int smb_command) 
	 * have tcon) are allowed as we start force umount

	 */

	spin_lock(&cifs_tcp_ses_lock);

	if (tcon->tidStatus == CifsExiting) {

	if (tcon->status == TID_EXITING) {

		if (smb_command != SMB_COM_WRITE_ANDX &&

		    smb_command != SMB_COM_OPEN_ANDX &&

		    smb_command != SMB_COM_TREE_DISCONNECT) {