diff options
Diffstat (limited to 'fs/cifs/sess.c')
-rw-r--r-- | fs/cifs/sess.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index f45c4730e92e..a1e6f7f45b13 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c | |||
@@ -191,7 +191,7 @@ static int decode_unicode_ssetup(char **pbcc_area, int bleft, | |||
191 | their final Unicode string - in which case we | 191 | their final Unicode string - in which case we |
192 | now will not attempt to decode the byte of junk | 192 | now will not attempt to decode the byte of junk |
193 | which follows it */ | 193 | which follows it */ |
194 | 194 | ||
195 | words_left = bleft / 2; | 195 | words_left = bleft / 2; |
196 | 196 | ||
197 | /* save off server operating system */ | 197 | /* save off server operating system */ |
@@ -266,11 +266,11 @@ static int decode_ascii_ssetup(char **pbcc_area, int bleft, | |||
266 | char *bcc_ptr = *pbcc_area; | 266 | char *bcc_ptr = *pbcc_area; |
267 | 267 | ||
268 | cFYI(1, ("decode sessetup ascii. bleft %d", bleft)); | 268 | cFYI(1, ("decode sessetup ascii. bleft %d", bleft)); |
269 | 269 | ||
270 | len = strnlen(bcc_ptr, bleft); | 270 | len = strnlen(bcc_ptr, bleft); |
271 | if (len >= bleft) | 271 | if (len >= bleft) |
272 | return rc; | 272 | return rc; |
273 | 273 | ||
274 | if (ses->serverOS) | 274 | if (ses->serverOS) |
275 | kfree(ses->serverOS); | 275 | kfree(ses->serverOS); |
276 | 276 | ||
@@ -412,7 +412,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
412 | cpu_to_le16(CIFS_SESS_KEY_SIZE); | 412 | cpu_to_le16(CIFS_SESS_KEY_SIZE); |
413 | pSMB->req_no_secext.CaseSensitivePasswordLength = | 413 | pSMB->req_no_secext.CaseSensitivePasswordLength = |
414 | cpu_to_le16(CIFS_SESS_KEY_SIZE); | 414 | cpu_to_le16(CIFS_SESS_KEY_SIZE); |
415 | 415 | ||
416 | /* calculate session key */ | 416 | /* calculate session key */ |
417 | SMBNTencrypt(ses->password, ses->server->cryptKey, | 417 | SMBNTencrypt(ses->password, ses->server->cryptKey, |
418 | ntlm_session_key); | 418 | ntlm_session_key); |
@@ -536,7 +536,7 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
536 | ses, nls_cp); | 536 | ses, nls_cp); |
537 | else | 537 | else |
538 | rc = decode_ascii_ssetup(&bcc_ptr, bytes_remaining, ses,nls_cp); | 538 | rc = decode_ascii_ssetup(&bcc_ptr, bytes_remaining, ses,nls_cp); |
539 | 539 | ||
540 | ssetup_exit: | 540 | ssetup_exit: |
541 | kfree(str_area); | 541 | kfree(str_area); |
542 | if (resp_buf_type == CIFS_SMALL_BUFFER) { | 542 | if (resp_buf_type == CIFS_SMALL_BUFFER) { |