Commit 81b1d39f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag '5.12-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6 

Pull cifs fixes from Steve French:
 "Five cifs/smb3 fixes, two for stable.

  Includes an important fix for encryption and an ACL fix, as well as a
  fix for possible reflink data corruption"

* tag '5.12-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6:
  smb3: fix cached file size problems in duplicate extents (reflink)
  cifs: Silently ignore unknown oplock break handle
  cifs: revalidate mapping when we open files for SMB1 POSIX
  cifs: Fix chmod with modefromsid when an older ACE already exists.
  cifs: Adjust key sizes and key generation routines for AES256 encryption
parents b44d1ddc cfc63fc8

fs/cifs/cifsacl.c

+1 −2
Original line number Diff line number Diff line
@@ -1130,8 +1130,7 @@ static int set_chmod_dacl(struct cifs_acl *pdacl, struct cifs_acl *pndacl, 
		}



		/* If it's any one of the ACE we're replacing, skip! */

		if (!mode_from_sid &&

				((compare_sids(&pntace->sid, &sid_unix_NFS_mode) == 0) ||

		if (((compare_sids(&pntace->sid, &sid_unix_NFS_mode) == 0) ||

				(compare_sids(&pntace->sid, pownersid) == 0) ||

				(compare_sids(&pntace->sid, pgrpsid) == 0) ||

				(compare_sids(&pntace->sid, &sid_everyone) == 0) ||

fs/cifs/cifsglob.h

+2 −2
Original line number Diff line number Diff line
@@ -919,8 +919,8 @@ struct cifs_ses { 
	bool binding:1; /* are we binding the session? */

	__u16 session_flags;

	__u8 smb3signingkey[SMB3_SIGN_KEY_SIZE];

	__u8 smb3encryptionkey[SMB3_SIGN_KEY_SIZE];

	__u8 smb3decryptionkey[SMB3_SIGN_KEY_SIZE];

	__u8 smb3encryptionkey[SMB3_ENC_DEC_KEY_SIZE];

	__u8 smb3decryptionkey[SMB3_ENC_DEC_KEY_SIZE];

	__u8 preauth_sha_hash[SMB2_PREAUTH_HASH_SIZE];



	__u8 binding_preauth_sha_hash[SMB2_PREAUTH_HASH_SIZE];

fs/cifs/cifspdu.h

+5 −0
Original line number Diff line number Diff line
@@ -147,6 +147,11 @@ 
 */

#define SMB3_SIGN_KEY_SIZE (16)



/*

 * Size of the smb3 encryption/decryption keys

 */

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

fs/cifs/file.c

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ int cifs_posix_open(char *full_path, struct inode **pinode, 
			goto posix_open_ret;

		}

	} else {

		cifs_revalidate_mapping(*pinode);

		cifs_fattr_to_inode(*pinode, &fattr);

	}

fs/cifs/smb2glob.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#define SMB2_HMACSHA256_SIZE (32)

#define SMB2_CMACAES_SIZE (16)

#define SMB3_SIGNKEY_SIZE (16)

#define SMB3_GCM128_CRYPTKEY_SIZE (16)

#define SMB3_GCM256_CRYPTKEY_SIZE (32)



/* Maximum buffer size value we can send with 1 credit */