diff options
| author | Shirish Pargaonkar <shirishpargaonkar@gmail.com> | 2010-10-04 19:56:13 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-10-06 16:13:19 +0000 |
| commit | c9928f7040a6e5f39e028bea500e0fde910d4a96 (patch) | |
| tree | 4a6b35fffc8b9b424e95073e8979e8ee406c9a4d /fs | |
| parent | 29e07c82a9e8acebbb38ecc22b0b5005a0a5d839 (diff) | |
| download | linux-3.10-c9928f7040a6e5f39e028bea500e0fde910d4a96.tar.gz linux-3.10-c9928f7040a6e5f39e028bea500e0fde910d4a96.tar.bz2 linux-3.10-c9928f7040a6e5f39e028bea500e0fde910d4a96.zip | |
ntlm authentication and signing - Correct response length for ntlmv2 authentication without extended security
Fix incorrect calculation of case sensitive response length in the
ntlmv2 (without extended security) response.
Signed-off-by: Shirish Pargaonkar <shirishpargaonkar@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/sess.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index af18a500f7e..c926e6c7c0c 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c @@ -739,9 +739,6 @@ ssetup_ntlmssp_authenticate: pSMB->req_no_secext.CaseInsensitivePasswordLength = 0; /* cpu_to_le16(LM2_SESS_KEY_SIZE); */ - pSMB->req_no_secext.CaseSensitivePasswordLength = - cpu_to_le16(sizeof(struct ntlmv2_resp)); - /* calculate session key */ rc = setup_ntlmv2_rsp(ses, v2_sess_key, nls_cp); if (rc) { @@ -753,6 +750,11 @@ ssetup_ntlmssp_authenticate: sizeof(struct ntlmv2_resp)); bcc_ptr += sizeof(struct ntlmv2_resp); kfree(v2_sess_key); + /* set case sensitive password length after tilen may get + * assigned, tilen is 0 otherwise. + */ + pSMB->req_no_secext.CaseSensitivePasswordLength = + cpu_to_le16(sizeof(struct ntlmv2_resp) + ses->tilen); if (ses->tilen > 0) { memcpy(bcc_ptr, ses->tiblob, ses->tilen); bcc_ptr += ses->tilen; @@ -761,6 +763,7 @@ ssetup_ntlmssp_authenticate: ses->tiblob = NULL; ses->tilen = 0; } + if (ses->capabilities & CAP_UNICODE) { if (iov[0].iov_len % 2) { *bcc_ptr = 0; |