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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] update cifs to version 1.74
  [CIFS] update limit for snprintf in cifs_construct_tcon
  cifs: Fix signing failure when server mandates signing for NTLMSSP
parents 3d68bd00 c2ec9471

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -129,5 +129,5 @@ extern long cifs_ioctl(struct file *filep, unsigned int cmd, unsigned long arg); 
extern const struct export_operations cifs_export_ops;

#endif /* CIFS_NFSD_EXPORT */



#define CIFS_VERSION   "1.73"

#define CIFS_VERSION   "1.74"

#endif				/* _CIFSFS_H */

fs/cifs/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -3485,7 +3485,7 @@ cifs_construct_tcon(struct cifs_sb_info *cifs_sb, uid_t fsuid) 
		goto out;

	}



	snprintf(username, MAX_USERNAME_SIZE, "krb50x%x", fsuid);

	snprintf(username, sizeof(username), "krb50x%x", fsuid);

	vol_info->username = username;

	vol_info->local_nls = cifs_sb->local_nls;

	vol_info->linux_uid = fsuid;

fs/cifs/sess.c

+5 −5
Original line number Diff line number Diff line
@@ -428,8 +428,7 @@ static void build_ntlmssp_negotiate_blob(unsigned char *pbuffer, 
			(SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) {

		flags |= NTLMSSP_NEGOTIATE_SIGN;

		if (!ses->server->session_estab)

			flags |= NTLMSSP_NEGOTIATE_KEY_XCH |

				NTLMSSP_NEGOTIATE_EXTENDED_SEC;

			flags |= NTLMSSP_NEGOTIATE_KEY_XCH;

	}



	sec_blob->NegotiateFlags = cpu_to_le32(flags);
@@ -465,10 +464,11 @@ static int build_ntlmssp_auth_blob(unsigned char *pbuffer, 
		NTLMSSP_NEGOTIATE_128 | NTLMSSP_NEGOTIATE_UNICODE |

		NTLMSSP_NEGOTIATE_NTLM | NTLMSSP_NEGOTIATE_EXTENDED_SEC;

	if (ses->server->sec_mode &

	   (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED))

	   (SECMODE_SIGN_REQUIRED | SECMODE_SIGN_ENABLED)) {

		flags |= NTLMSSP_NEGOTIATE_SIGN;

	if (ses->server->sec_mode & SECMODE_SIGN_REQUIRED)

		flags |= NTLMSSP_NEGOTIATE_ALWAYS_SIGN;

		if (!ses->server->session_estab)

			flags |= NTLMSSP_NEGOTIATE_KEY_XCH;

	}



	tmp = pbuffer + sizeof(AUTHENTICATE_MESSAGE);

	sec_blob->NegotiateFlags = cpu_to_le32(flags);