mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 23:25:07 +00:00
Code Issues Releases Wiki Activity

Revert "Eliminate sparse warning - bad constant expression"

Browse source 
This reverts commit 2d20ca8358.

    The change to kernel crypto and fixes to ntlvm2 and ntlmssp
    series, introduced a regression.  Deferring this patch series
    to 2.6.37 after Shirish fixes it.

Signed-off-by: Steve French <sfrench@us.ibm.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
CC: Shirish Pargaonkar <shirishp@us.ibm.com>
This commit is contained in:
Steve French 2010-09-08 20:57:05 +00:00
parent 7100ae9726
commit 56234e2767
2 changed files with 72 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

193
fs/cifs/cifsencrypt.c
View file

@ -45,38 +45,39 @@ extern void SMBencrypt(unsigned char *passwd, const unsigned char *c8,
static int cifs_calculate_signature(const struct smb_hdr *cifs_pdu, static int cifs_calculate_signature(const struct smb_hdr *cifs_pdu,
struct TCP_Server_Info *server, char *signature) struct TCP_Server_Info *server, char *signature)
{ {
int rc; int rc = 0;
struct {
struct shash_desc shash;
char ctx[crypto_shash_descsize(server->ntlmssp.md5)];
} sdesc;
if (cifs_pdu == NULL || server == NULL || signature == NULL) if (cifs_pdu == NULL || server == NULL || signature == NULL)
return -EINVAL; return -EINVAL;
if (!server->ntlmssp.sdescmd5) { sdesc.shash.tfm = server->ntlmssp.md5;
cERROR(1, sdesc.shash.flags = 0x0;
"cifs_calculate_signature: can't generate signature\n");
return -1;
}
rc = crypto_shash_init(&server->ntlmssp.sdescmd5->shash); rc = crypto_shash_init(&sdesc.shash);
if (rc) { if (rc) {
cERROR(1, "cifs_calculate_signature: oould not init md5\n"); cERROR(1, "could not initialize master crypto API hmacmd5\n");
return rc; return rc;
} }
if (server->secType == RawNTLMSSP) if (server->secType == RawNTLMSSP)
crypto_shash_update(&server->ntlmssp.sdescmd5->shash, crypto_shash_update(&sdesc.shash,
server->session_key.data.ntlmv2.key, server->session_key.data.ntlmv2.key,
CIFS_NTLMV2_SESSKEY_SIZE); CIFS_NTLMV2_SESSKEY_SIZE);
else else
crypto_shash_update(&server->ntlmssp.sdescmd5->shash, crypto_shash_update(&sdesc.shash,
(char *)&server->session_key.data, (char *)&server->session_key.data,
server->session_key.len); server->session_key.len);
crypto_shash_update(&server->ntlmssp.sdescmd5->shash, crypto_shash_update(&sdesc.shash,
cifs_pdu->Protocol, cifs_pdu->smb_buf_length); cifs_pdu->Protocol, cifs_pdu->smb_buf_length);
rc = crypto_shash_final(&server->ntlmssp.sdescmd5->shash, signature); rc = crypto_shash_final(&sdesc.shash, signature);
return rc; return 0;
} }
@ -114,28 +115,30 @@ static int cifs_calc_signature2(const struct kvec *iov, int n_vec,
struct TCP_Server_Info *server, char *signature) struct TCP_Server_Info *server, char *signature)
{ {
int i; int i;
int rc; int rc = 0;
struct {
struct shash_desc shash;
char ctx[crypto_shash_descsize(server->ntlmssp.md5)];
} sdesc;
if (iov == NULL || server == NULL || signature == NULL) if (iov == NULL || server == NULL || signature == NULL)
return -EINVAL; return -EINVAL;
if (!server->ntlmssp.sdescmd5) { sdesc.shash.tfm = server->ntlmssp.md5;
cERROR(1, "cifs_calc_signature2: can't generate signature\n"); sdesc.shash.flags = 0x0;
return -1;
}
rc = crypto_shash_init(&server->ntlmssp.sdescmd5->shash); rc = crypto_shash_init(&sdesc.shash);
if (rc) { if (rc) {
cERROR(1, "cifs_calc_signature2: oould not init md5\n"); cERROR(1, "could not initialize master crypto API hmacmd5\n");
return rc; return rc;
} }
if (server->secType == RawNTLMSSP) if (server->secType == RawNTLMSSP)
crypto_shash_update(&server->ntlmssp.sdescmd5->shash, crypto_shash_update(&sdesc.shash,
server->session_key.data.ntlmv2.key, server->session_key.data.ntlmv2.key,
CIFS_NTLMV2_SESSKEY_SIZE); CIFS_NTLMV2_SESSKEY_SIZE);
else else
crypto_shash_update(&server->ntlmssp.sdescmd5->shash, crypto_shash_update(&sdesc.shash,
(char *)&server->session_key.data, (char *)&server->session_key.data,
server->session_key.len); server->session_key.len);
@ -143,7 +146,7 @@ static int cifs_calc_signature2(const struct kvec *iov, int n_vec,
if (iov[i].iov_len == 0) if (iov[i].iov_len == 0)
continue; continue;
if (iov[i].iov_base == NULL) { if (iov[i].iov_base == NULL) {
cERROR(1, "cifs_calc_signature2: null iovec entry"); cERROR(1, "null iovec entry");
return -EIO; return -EIO;
} }
/* The first entry includes a length field (which does not get /* The first entry includes a length field (which does not get
@ -151,16 +154,16 @@ static int cifs_calc_signature2(const struct kvec *iov, int n_vec,
if (i == 0) { if (i == 0) {
if (iov[0].iov_len <= 8) /* cmd field at offset 9 */ if (iov[0].iov_len <= 8) /* cmd field at offset 9 */
break; /* nothing to sign or corrupt header */ break; /* nothing to sign or corrupt header */
crypto_shash_update(&server->ntlmssp.sdescmd5->shash, crypto_shash_update(&sdesc.shash,
iov[i].iov_base + 4, iov[i].iov_len - 4); iov[i].iov_base + 4, iov[i].iov_len - 4);
} else } else
crypto_shash_update(&server->ntlmssp.sdescmd5->shash, crypto_shash_update(&sdesc.shash,
iov[i].iov_base, iov[i].iov_len); iov[i].iov_base, iov[i].iov_len);
} }
rc = crypto_shash_final(&server->ntlmssp.sdescmd5->shash, signature); rc = crypto_shash_final(&sdesc.shash, signature);
return rc; return 0;
} }
int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *server, int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *server,
@ -310,48 +313,43 @@ static int calc_ntlmv2_hash(struct cifsSesInfo *ses,
wchar_t *user; wchar_t *user;
wchar_t *domain; wchar_t *domain;
wchar_t *server; wchar_t *server;
struct {
if (!ses->server->ntlmssp.sdeschmacmd5) { struct shash_desc shash;
cERROR(1, "calc_ntlmv2_hash: can't generate ntlmv2 hash\n"); char ctx[crypto_shash_descsize(ses->server->ntlmssp.hmacmd5)];
return -1; } sdesc;
}
/* calculate md4 hash of password */ /* calculate md4 hash of password */
E_md4hash(ses->password, nt_hash); E_md4hash(ses->password, nt_hash);
sdesc.shash.tfm = ses->server->ntlmssp.hmacmd5;
sdesc.shash.flags = 0x0;
crypto_shash_setkey(ses->server->ntlmssp.hmacmd5, nt_hash, crypto_shash_setkey(ses->server->ntlmssp.hmacmd5, nt_hash,
CIFS_NTHASH_SIZE); CIFS_NTHASH_SIZE);
rc = crypto_shash_init(&ses->server->ntlmssp.sdeschmacmd5->shash); rc = crypto_shash_init(&sdesc.shash);
if (rc) { if (rc) {
cERROR(1, "calc_ntlmv2_hash: could not init hmacmd5\n"); cERROR(1, "could not initialize master crypto API hmacmd5\n");
return rc; return rc;
} }
/* convert ses->userName to unicode and uppercase */ /* convert ses->userName to unicode and uppercase */
len = strlen(ses->userName); len = strlen(ses->userName);
user = kmalloc(2 + (len * 2), GFP_KERNEL); user = kmalloc(2 + (len * 2), GFP_KERNEL);
if (user == NULL) { if (user == NULL)
cERROR(1, "calc_ntlmv2_hash: user mem alloc failure\n");
rc = -ENOMEM;
goto calc_exit_2; goto calc_exit_2;
}
len = cifs_strtoUCS((__le16 *)user, ses->userName, len, nls_cp); len = cifs_strtoUCS((__le16 *)user, ses->userName, len, nls_cp);
UniStrupr(user); UniStrupr(user);
crypto_shash_update(&ses->server->ntlmssp.sdeschmacmd5->shash, crypto_shash_update(&sdesc.shash, (char *)user, 2 * len);
(char *)user, 2 * len);
/* convert ses->domainName to unicode and uppercase */ /* convert ses->domainName to unicode and uppercase */
if (ses->domainName) { if (ses->domainName) {
len = strlen(ses->domainName); len = strlen(ses->domainName);
domain = kmalloc(2 + (len * 2), GFP_KERNEL); domain = kmalloc(2 + (len * 2), GFP_KERNEL);
if (domain == NULL) { if (domain == NULL)
cERROR(1, "calc_ntlmv2_hash: domain mem alloc failure");
rc = -ENOMEM;
goto calc_exit_1; goto calc_exit_1;
}
len = cifs_strtoUCS((__le16 *)domain, ses->domainName, len, len = cifs_strtoUCS((__le16 *)domain, ses->domainName, len,
nls_cp); nls_cp);
/* the following line was removed since it didn't work well /* the following line was removed since it didn't work well
@ -359,19 +357,15 @@ static int calc_ntlmv2_hash(struct cifsSesInfo *ses,
Maybe converting the domain name earlier makes sense */ Maybe converting the domain name earlier makes sense */
/* UniStrupr(domain); */ /* UniStrupr(domain); */
crypto_shash_update(&ses->server->ntlmssp.sdeschmacmd5->shash, crypto_shash_update(&sdesc.shash, (char *)domain, 2 * len);
(char *)domain, 2 * len);
kfree(domain); kfree(domain);
} else if (ses->serverName) { } else if (ses->serverName) {
len = strlen(ses->serverName); len = strlen(ses->serverName);
server = kmalloc(2 + (len * 2), GFP_KERNEL); server = kmalloc(2 + (len * 2), GFP_KERNEL);
if (server == NULL) { if (server == NULL)
cERROR(1, "calc_ntlmv2_hash: server mem alloc failure");
rc = -ENOMEM;
goto calc_exit_1; goto calc_exit_1;
}
len = cifs_strtoUCS((__le16 *)server, ses->serverName, len, len = cifs_strtoUCS((__le16 *)server, ses->serverName, len,
nls_cp); nls_cp);
/* the following line was removed since it didn't work well /* the following line was removed since it didn't work well
@ -379,20 +373,16 @@ static int calc_ntlmv2_hash(struct cifsSesInfo *ses,
Maybe converting the domain name earlier makes sense */ Maybe converting the domain name earlier makes sense */
/* UniStrupr(domain); */ /* UniStrupr(domain); */
crypto_shash_update(&ses->server->ntlmssp.sdeschmacmd5->shash, crypto_shash_update(&sdesc.shash, (char *)server, 2 * len);
(char *)server, 2 * len);
kfree(server); kfree(server);
} }
rc = crypto_shash_final(&ses->server->ntlmssp.sdeschmacmd5->shash,
ses->server->ntlmv2_hash);
calc_exit_1: calc_exit_1:
kfree(user); kfree(user);
calc_exit_2: calc_exit_2:
/* BB FIXME what about bytes 24 through 40 of the signing key? /* BB FIXME what about bytes 24 through 40 of the signing key?
compare with the NTLM example */ compare with the NTLM example */
rc = crypto_shash_final(&sdesc.shash, ses->server->ntlmv2_hash);
return rc; return rc;
} }
@ -452,33 +442,34 @@ CalcNTLMv2_response(const struct TCP_Server_Info *server,
char *v2_session_response) char *v2_session_response)
{ {
int rc; int rc;
struct {
struct shash_desc shash;
char ctx[crypto_shash_descsize(server->ntlmssp.hmacmd5)];
} sdesc;
if (!server->ntlmssp.sdeschmacmd5) { sdesc.shash.tfm = server->ntlmssp.hmacmd5;
cERROR(1, "calc_ntlmv2_hash: can't generate ntlmv2 hash\n"); sdesc.shash.flags = 0x0;
return -1;
}
crypto_shash_setkey(server->ntlmssp.hmacmd5, server->ntlmv2_hash, crypto_shash_setkey(server->ntlmssp.hmacmd5, server->ntlmv2_hash,
CIFS_HMAC_MD5_HASH_SIZE); CIFS_HMAC_MD5_HASH_SIZE);
rc = crypto_shash_init(&server->ntlmssp.sdeschmacmd5->shash); rc = crypto_shash_init(&sdesc.shash);
if (rc) { if (rc) {
cERROR(1, "CalcNTLMv2_response: could not init hmacmd5"); cERROR(1, "could not initialize master crypto API hmacmd5\n");
return rc; return rc;
} }
memcpy(v2_session_response + CIFS_SERVER_CHALLENGE_SIZE, memcpy(v2_session_response + CIFS_SERVER_CHALLENGE_SIZE,
server->cryptKey, CIFS_SERVER_CHALLENGE_SIZE); server->cryptKey, CIFS_SERVER_CHALLENGE_SIZE);
crypto_shash_update(&server->ntlmssp.sdeschmacmd5->shash, crypto_shash_update(&sdesc.shash,
v2_session_response + CIFS_SERVER_CHALLENGE_SIZE, v2_session_response + CIFS_SERVER_CHALLENGE_SIZE,
sizeof(struct ntlmv2_resp) - CIFS_SERVER_CHALLENGE_SIZE); sizeof(struct ntlmv2_resp) - CIFS_SERVER_CHALLENGE_SIZE);
if (server->tilen) if (server->tilen)
crypto_shash_update(&server->ntlmssp.sdeschmacmd5->shash, crypto_shash_update(&sdesc.shash,
server->tiblob, server->tilen); server->tiblob, server->tilen);
rc = crypto_shash_final(&server->ntlmssp.sdeschmacmd5->shash, rc = crypto_shash_final(&sdesc.shash, v2_session_response);
v2_session_response);
return rc; return rc;
} }
@ -489,6 +480,10 @@ setup_ntlmv2_rsp(struct cifsSesInfo *ses, char *resp_buf,
{ {
int rc = 0; int rc = 0;
struct ntlmv2_resp *buf = (struct ntlmv2_resp *)resp_buf; struct ntlmv2_resp *buf = (struct ntlmv2_resp *)resp_buf;
struct {
struct shash_desc shash;
char ctx[crypto_shash_descsize(ses->server->ntlmssp.hmacmd5)];
} sdesc;
buf->blob_signature = cpu_to_le32(0x00000101); buf->blob_signature = cpu_to_le32(0x00000101);
buf->reserved = 0; buf->reserved = 0;
@ -516,24 +511,21 @@ setup_ntlmv2_rsp(struct cifsSesInfo *ses, char *resp_buf,
return rc; return rc;
} }
if (!ses->server->ntlmssp.sdeschmacmd5) {
cERROR(1, "calc_ntlmv2_hash: can't generate ntlmv2 hash\n");
return -1;
}
crypto_shash_setkey(ses->server->ntlmssp.hmacmd5, crypto_shash_setkey(ses->server->ntlmssp.hmacmd5,
ses->server->ntlmv2_hash, CIFS_HMAC_MD5_HASH_SIZE); ses->server->ntlmv2_hash, CIFS_HMAC_MD5_HASH_SIZE);
rc = crypto_shash_init(&ses->server->ntlmssp.sdeschmacmd5->shash); sdesc.shash.tfm = ses->server->ntlmssp.hmacmd5;
sdesc.shash.flags = 0x0;
rc = crypto_shash_init(&sdesc.shash);
if (rc) { if (rc) {
cERROR(1, "setup_ntlmv2_rsp: could not init hmacmd5\n"); cERROR(1, "could not initialize master crypto API hmacmd5\n");
return rc; return rc;
} }
crypto_shash_update(&ses->server->ntlmssp.sdeschmacmd5->shash, crypto_shash_update(&sdesc.shash, resp_buf, CIFS_HMAC_MD5_HASH_SIZE);
resp_buf, CIFS_HMAC_MD5_HASH_SIZE);
rc = crypto_shash_final(&ses->server->ntlmssp.sdeschmacmd5->shash, rc = crypto_shash_final(&sdesc.shash,
ses->server->session_key.data.ntlmv2.key); ses->server->session_key.data.ntlmv2.key);
memcpy(&ses->server->session_key.data.ntlmv2.resp, resp_buf, memcpy(&ses->server->session_key.data.ntlmv2.resp, resp_buf,
@ -586,65 +578,24 @@ cifs_crypto_shash_release(struct TCP_Server_Info *server)
if (server->ntlmssp.hmacmd5) if (server->ntlmssp.hmacmd5)
crypto_free_shash(server->ntlmssp.hmacmd5); crypto_free_shash(server->ntlmssp.hmacmd5);
kfree(server->ntlmssp.sdeschmacmd5);
kfree(server->ntlmssp.sdescmd5);
} }
int int
cifs_crypto_shash_allocate(struct TCP_Server_Info *server) cifs_crypto_shash_allocate(struct TCP_Server_Info *server)
{ {
int rc;
unsigned int size;
server->ntlmssp.hmacmd5 = crypto_alloc_shash("hmac(md5)", 0, 0); server->ntlmssp.hmacmd5 = crypto_alloc_shash("hmac(md5)", 0, 0);
if (!server->ntlmssp.hmacmd5 || if (!server->ntlmssp.hmacmd5 ||
IS_ERR(server->ntlmssp.hmacmd5)) { IS_ERR(server->ntlmssp.hmacmd5)) {
cERROR(1, "could not allocate crypto hmacmd5\n"); cERROR(1, "could not allocate master crypto API hmacmd5\n");
return 1; return 1;
} }
server->ntlmssp.md5 = crypto_alloc_shash("md5", 0, 0); server->ntlmssp.md5 = crypto_alloc_shash("md5", 0, 0);
if (!server->ntlmssp.md5 || IS_ERR(server->ntlmssp.md5)) { if (!server->ntlmssp.md5 || IS_ERR(server->ntlmssp.md5)) {
cERROR(1, "could not allocate crypto md5\n"); crypto_free_shash(server->ntlmssp.hmacmd5);
rc = 1; cERROR(1, "could not allocate master crypto API md5\n");
goto cifs_crypto_shash_allocate_ret1; return 1;
} }
size = sizeof(struct shash_desc) +
crypto_shash_descsize(server->ntlmssp.hmacmd5);
server->ntlmssp.sdeschmacmd5 = kmalloc(size, GFP_KERNEL);
if (!server->ntlmssp.sdeschmacmd5) {
cERROR(1, "cifs_crypto_shash_allocate: can't alloc hmacmd5\n");
rc = -ENOMEM;
goto cifs_crypto_shash_allocate_ret2;
}
server->ntlmssp.sdeschmacmd5->shash.tfm = server->ntlmssp.hmacmd5;
server->ntlmssp.sdeschmacmd5->shash.flags = 0x0;
size = sizeof(struct shash_desc) +
crypto_shash_descsize(server->ntlmssp.md5);
server->ntlmssp.sdescmd5 = kmalloc(size, GFP_KERNEL);
if (!server->ntlmssp.sdescmd5) {
cERROR(1, "cifs_crypto_shash_allocate: can't alloc md5\n");
rc = -ENOMEM;
goto cifs_crypto_shash_allocate_ret3;
}
server->ntlmssp.sdescmd5->shash.tfm = server->ntlmssp.md5;
server->ntlmssp.sdescmd5->shash.flags = 0x0;
return 0; return 0;
cifs_crypto_shash_allocate_ret3:
kfree(server->ntlmssp.sdeschmacmd5);
cifs_crypto_shash_allocate_ret2:
crypto_free_shash(server->ntlmssp.md5);
cifs_crypto_shash_allocate_ret1:
crypto_free_shash(server->ntlmssp.hmacmd5);
return rc;
} }

7
fs/cifs/cifsglob.h
View file

@ -123,19 +123,12 @@ struct cifs_cred {
struct cifs_ace *aces; struct cifs_ace *aces;
}; };
struct sdesc {
struct shash_desc shash;
char ctx[];
};
struct ntlmssp_auth { struct ntlmssp_auth {
__u32 client_flags; __u32 client_flags;
__u32 server_flags; __u32 server_flags;
unsigned char ciphertext[CIFS_CPHTXT_SIZE]; unsigned char ciphertext[CIFS_CPHTXT_SIZE];
struct crypto_shash *hmacmd5; struct crypto_shash *hmacmd5;
struct crypto_shash *md5; struct crypto_shash *md5;
struct sdesc *sdeschmacmd5;
struct sdesc *sdescmd5;
}; };
/* /*