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

7 files changed, 32 insertions, 64 deletions

diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
index 2cfb695d1f89..5d9b9acc5fce 100644
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/cifs/cifsencrypt.c
@@ -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);
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index d9dbaf869cd1..30ff56005d8f 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -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 */
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h
index ef4f631e4c01..6f4e243e0f62 100644
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
@@ -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);
 
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index d545a95c30ed..c0458c543f17 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -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) {
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index ea096ce5d4f7..c1f063cd1b0c 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -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);
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c
index c7d80e24f24e..4ec3ee9d72cc 100644
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
@@ -683,7 +683,7 @@ ssetup_ntlmssp_authenticate:
                         cpu_to_le16(CIFS_AUTH_RESP_SIZE);
 
                 /* calculate ntlm response and session key */
-                rc = setup_ntlm_response(ses);
+                rc = setup_ntlm_response(ses, nls_cp);
                 if (rc) {
                         cERROR(1, "Error %d during NTLM authentication", rc);
                         goto ssetup_exit;
diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c
index ac1221d969d6..7cacba12b8f1 100644
--- a/fs/cifs/smbencrypt.c
+++ b/fs/cifs/smbencrypt.c
@@ -199,75 +199,36 @@ SMBencrypt(unsigned char *passwd, const unsigned char *c8, unsigned char *p24)
         return rc;
 }
 
-/* Routines for Windows NT MD4 Hash functions. */
-static int
-_my_wcslen(__u16 *str)
-{
-        int len = 0;
-        while (*str++ != 0)
-                len++;
-        return len;
-}
-
-/*
- * Convert a string into an NT UNICODE string.
- * Note that regardless of processor type
- * this must be in intel (little-endian)
- * format.
- */
-
-static int
-_my_mbstowcs(__u16 *dst, const unsigned char *src, int len)
-{       /* BB not a very good conversion routine - change/fix */
-        int i;
-        __u16 val;
-
-        for (i = 0; i < len; i++) {
-                val = *src;
-                SSVAL(dst, 0, val);
-                dst++;
-                src++;
-                if (val == 0)
-                        break;
-        }
-        return i;
-}
-
 /*
  * Creates the MD4 Hash of the users password in NT UNICODE.
  */
 
 int
-E_md4hash(const unsigned char *passwd, unsigned char *p16)
+E_md4hash(const unsigned char *passwd, unsigned char *p16,
+        const struct nls_table *codepage)
 {
         int rc;
         int len;
         __u16 wpwd[129];
 
         /* Password cannot be longer than 128 characters */
-        if (passwd) {
-                len = strlen((char *) passwd);
-                if (len > 128)
-                        len = 128;
-
-                /* Password must be converted to NT unicode */
-                _my_mbstowcs(wpwd, passwd, len);
-        } else
+        if (passwd) /* Password must be converted to NT unicode */
+                len = cifs_strtoUCS(wpwd, passwd, 128, codepage);
+        else {
                 len = 0;
+                *wpwd = 0; /* Ensure string is null terminated */
+        }
 
-        wpwd[len] = 0;  /* Ensure string is null terminated */
-        /* Calculate length in bytes */
-        len = _my_wcslen(wpwd) * sizeof(__u16);
-
-        rc = mdfour(p16, (unsigned char *) wpwd, len);
-        memset(wpwd, 0, 129 * 2);
+        rc = mdfour(p16, (unsigned char *) wpwd, len * sizeof(__u16));
+        memset(wpwd, 0, 129 * sizeof(__u16));
 
         return rc;
 }
 
 /* Does the NT MD4 hash then des encryption. */
 int
-SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24)
+SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24,
+                const struct nls_table *codepage)
 {
         int rc;
         unsigned char p16[16], p21[21];
@@ -275,7 +236,7 @@ SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24)
         memset(p16, '\0', 16);
         memset(p21, '\0', 21);
 
-        rc = E_md4hash(passwd, p16);
+        rc = E_md4hash(passwd, p16, codepage);
         if (rc) {
                 cFYI(1, "%s Can't generate NT hash, error: %d", __func__, rc);
                 return rc;