Commit 1a67a573 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.samba.org/sfrench/cifs-2.6 

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: Assume passwords are encoded according to iocharset (try #2)
  CIFS: Fix the VFS brlock cache usage in posix locking case
  [CIFS] Update cifs version to 1.76
  CIFS: Remove extra mutex_unlock in cifs_lock_add_if
parents 6dbbd925 9ef5992e

fs/cifs/cifsencrypt.c

+4 −4
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ int cifs_verify_signature(struct kvec *iov, unsigned int nr_iov, 
}



/* first calculate 24 bytes ntlm response and then 16 byte session key */

int setup_ntlm_response(struct cifs_ses *ses)

int setup_ntlm_response(struct cifs_ses *ses, const struct nls_table *nls_cp)

{

	int rc = 0;

	unsigned int temp_len = CIFS_SESS_KEY_SIZE + CIFS_AUTH_RESP_SIZE;
@@ -221,14 +221,14 @@ int setup_ntlm_response(struct cifs_ses *ses) 
	ses->auth_key.len = temp_len;



	rc = SMBNTencrypt(ses->password, ses->server->cryptkey,

			ses->auth_key.response + CIFS_SESS_KEY_SIZE);

			ses->auth_key.response + CIFS_SESS_KEY_SIZE, nls_cp);

	if (rc) {

		cFYI(1, "%s Can't generate NTLM response, error: %d",

			__func__, rc);

		return rc;

	}



	rc = E_md4hash(ses->password, temp_key);

	rc = E_md4hash(ses->password, temp_key, nls_cp);

	if (rc) {

		cFYI(1, "%s Can't generate NT hash, error: %d", __func__, rc);

		return rc;
@@ -404,7 +404,7 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, 
	}



	/* calculate md4 hash of password */

	E_md4hash(ses->password, nt_hash);

	E_md4hash(ses->password, nt_hash, nls_cp);



	rc = crypto_shash_setkey(ses->server->secmech.hmacmd5, nt_hash,

				CIFS_NTHASH_SIZE);

fs/cifs/cifsfs.h

+1 −1
Original line number Diff line number Diff line
@@ -125,5 +125,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   "1.75"

#define CIFS_VERSION   "1.76"

#endif				/* _CIFSFS_H */

fs/cifs/cifsproto.h

+5 −3
Original line number Diff line number Diff line
@@ -395,8 +395,9 @@ extern int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *, 
extern int cifs_verify_signature(struct kvec *iov, unsigned int nr_iov,

				 struct TCP_Server_Info *server,

				__u32 expected_sequence_number);

extern int SMBNTencrypt(unsigned char *, unsigned char *, unsigned char *);

extern int setup_ntlm_response(struct cifs_ses *);

extern int SMBNTencrypt(unsigned char *, unsigned char *, unsigned char *,

			const struct nls_table *);

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 int cifs_crypto_shash_allocate(struct TCP_Server_Info *);

extern void cifs_crypto_shash_release(struct TCP_Server_Info *);
@@ -448,7 +449,8 @@ extern int CIFSCheckMFSymlink(struct cifs_fattr *fattr, 
		const unsigned char *path,

		struct cifs_sb_info *cifs_sb, int xid);

extern int mdfour(unsigned char *, unsigned char *, int);

extern int E_md4hash(const unsigned char *passwd, unsigned char *p16);

extern int E_md4hash(const unsigned char *passwd, unsigned char *p16,

			const struct nls_table *codepage);

extern int SMBencrypt(unsigned char *passwd, const unsigned char *c8,

			unsigned char *p24);

fs/cifs/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -3452,7 +3452,7 @@ CIFSTCon(unsigned int xid, struct cifs_ses *ses, 
		else

#endif /* CIFS_WEAK_PW_HASH */

		rc = SMBNTencrypt(tcon->password, ses->server->cryptkey,

					bcc_ptr);

					bcc_ptr, nls_codepage);



		bcc_ptr += CIFS_AUTH_RESP_SIZE;

		if (ses->capabilities & CAP_UNICODE) {

fs/cifs/file.c

+8 −3
Original line number Diff line number Diff line
@@ -778,7 +778,6 @@ try_again: 
		else {

			mutex_lock(&cinode->lock_mutex);

			list_del_init(&lock->blist);

			mutex_unlock(&cinode->lock_mutex);

		}

	}
@@ -794,6 +793,9 @@ cifs_posix_lock_test(struct file *file, struct file_lock *flock) 
	struct cifsInodeInfo *cinode = CIFS_I(file->f_path.dentry->d_inode);

	unsigned char saved_type = flock->fl_type;



	if ((flock->fl_flags & FL_POSIX) == 0)

		return 1;



	mutex_lock(&cinode->lock_mutex);

	posix_test_lock(file, flock);
@@ -810,12 +812,15 @@ static int 
cifs_posix_lock_set(struct file *file, struct file_lock *flock)

{

	struct cifsInodeInfo *cinode = CIFS_I(file->f_path.dentry->d_inode);

	int rc;

	int rc = 1;



	if ((flock->fl_flags & FL_POSIX) == 0)

		return rc;



	mutex_lock(&cinode->lock_mutex);

	if (!cinode->can_cache_brlcks) {

		mutex_unlock(&cinode->lock_mutex);

		return 1;

		return rc;

	}

	rc = posix_lock_file_wait(file, flock);

	mutex_unlock(&cinode->lock_mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE