diff options
Diffstat (limited to 'fs/cifs/sess.c')
-rw-r--r-- | fs/cifs/sess.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/cifs/sess.c b/fs/cifs/sess.c index 623c86cded24..b3f9d40d06db 100644 --- a/fs/cifs/sess.c +++ b/fs/cifs/sess.c | |||
@@ -75,7 +75,7 @@ static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB) | |||
75 | return capabilities; | 75 | return capabilities; |
76 | } | 76 | } |
77 | 77 | ||
78 | static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses, | 78 | static void unicode_ssetup_strings(char **pbcc_area, struct cifsSesInfo *ses, |
79 | const struct nls_table *nls_cp) | 79 | const struct nls_table *nls_cp) |
80 | { | 80 | { |
81 | char *bcc_ptr = *pbcc_area; | 81 | char *bcc_ptr = *pbcc_area; |
@@ -108,7 +108,7 @@ static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses, | |||
108 | *(bcc_ptr+1) = 0; | 108 | *(bcc_ptr+1) = 0; |
109 | bytes_ret = 0; | 109 | bytes_ret = 0; |
110 | } else | 110 | } else |
111 | bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, ses->domainName, | 111 | bytes_ret = cifs_strtoUCS((__le16 *) bcc_ptr, ses->domainName, |
112 | 256, nls_cp); | 112 | 256, nls_cp); |
113 | bcc_ptr += 2 * bytes_ret; | 113 | bcc_ptr += 2 * bytes_ret; |
114 | bcc_ptr += 2; /* account for null terminator */ | 114 | bcc_ptr += 2; /* account for null terminator */ |
@@ -130,7 +130,7 @@ static void unicode_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses, | |||
130 | *pbcc_area = bcc_ptr; | 130 | *pbcc_area = bcc_ptr; |
131 | } | 131 | } |
132 | 132 | ||
133 | static void ascii_ssetup_strings(char ** pbcc_area, struct cifsSesInfo *ses, | 133 | static void ascii_ssetup_strings(char **pbcc_area, struct cifsSesInfo *ses, |
134 | const struct nls_table *nls_cp) | 134 | const struct nls_table *nls_cp) |
135 | { | 135 | { |
136 | char *bcc_ptr = *pbcc_area; | 136 | char *bcc_ptr = *pbcc_area; |
@@ -468,7 +468,8 @@ CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses, int first_time, | |||
468 | 468 | ||
469 | /* memcpy(bcc_ptr, (char *)ntlm_session_key,LM2_SESS_KEY_SIZE); | 469 | /* memcpy(bcc_ptr, (char *)ntlm_session_key,LM2_SESS_KEY_SIZE); |
470 | bcc_ptr += LM2_SESS_KEY_SIZE; */ | 470 | bcc_ptr += LM2_SESS_KEY_SIZE; */ |
471 | memcpy(bcc_ptr, (char *)v2_sess_key, sizeof(struct ntlmv2_resp)); | 471 | memcpy(bcc_ptr, (char *)v2_sess_key, |
472 | sizeof(struct ntlmv2_resp)); | ||
472 | bcc_ptr += sizeof(struct ntlmv2_resp); | 473 | bcc_ptr += sizeof(struct ntlmv2_resp); |
473 | kfree(v2_sess_key); | 474 | kfree(v2_sess_key); |
474 | if (ses->capabilities & CAP_UNICODE) { | 475 | if (ses->capabilities & CAP_UNICODE) { |