Skip to content

L
linux
Commit db44ca9f authored by Enzo Matsumiya's avatar Enzo Matsumiya Committed by Steve French
Browse files
Options

smb: client: make HMAC-MD5 TFM ephemeral 

The HMAC-MD5 shash TFM is used only briefly during Session Setup stage,
when computing NTLMv2 hashes.

There's no need to keep it allocated in servers' secmech the whole time,
so keep its lifetime inside setup_ntlmv2_rsp().
Signed-off-by: default avatarEnzo Matsumiya <ematsumiya@suse.de>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent a13ca780
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 84 deletions
fs/smb/client/cifsencrypt.c
View file @ db44ca9f
...@@ -416,7 +416,7 @@ find_timestamp(struct cifs_ses *ses) ...@@ -416,7 +416,7 @@ find_timestamp(struct cifs_ses *ses)
} }
static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
const struct nls_table *nls_cp) const struct nls_table *nls_cp, struct shash_desc *hmacmd5)
{ {
int rc = 0; int rc = 0;
int len; int len;
...@@ -425,34 +425,26 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, ...@@ -425,34 +425,26 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
wchar_t *domain; wchar_t *domain;
wchar_t *server; wchar_t *server;
if (!ses->server->secmech.hmacmd5) {
cifs_dbg(VFS, "%s: can't generate ntlmv2 hash\n", __func__);
return -1;
}
/* calculate md4 hash of password */ /* calculate md4 hash of password */
E_md4hash(ses->password, nt_hash, nls_cp); E_md4hash(ses->password, nt_hash, nls_cp);
rc = crypto_shash_setkey(ses->server->secmech.hmacmd5->tfm, nt_hash, rc = crypto_shash_setkey(hmacmd5->tfm, nt_hash, CIFS_NTHASH_SIZE);
CIFS_NTHASH_SIZE);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not set NT Hash as a key\n", __func__); cifs_dbg(VFS, "%s: Could not set NT hash as a key, rc=%d\n", __func__, rc);
return rc; return rc;
} }
rc = crypto_shash_init(ses->server->secmech.hmacmd5); rc = crypto_shash_init(hmacmd5);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not init hmacmd5\n", __func__); cifs_dbg(VFS, "%s: Could not init HMAC-MD5, rc=%d\n", __func__, rc);
return rc; return rc;
} }
/* convert ses->user_name to unicode */ /* convert ses->user_name to unicode */
len = ses->user_name ? strlen(ses->user_name) : 0; len = ses->user_name ? strlen(ses->user_name) : 0;
user = kmalloc(2 + (len * 2), GFP_KERNEL); user = kmalloc(2 + (len * 2), GFP_KERNEL);
if (user == NULL) { if (user == NULL)
rc = -ENOMEM; return -ENOMEM;
return rc;
}
if (len) { if (len) {
len = cifs_strtoUTF16(user, ses->user_name, len, nls_cp); len = cifs_strtoUTF16(user, ses->user_name, len, nls_cp);
...@@ -461,11 +453,10 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, ...@@ -461,11 +453,10 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
*(u16 *)user = 0; *(u16 *)user = 0;
} }
rc = crypto_shash_update(ses->server->secmech.hmacmd5, rc = crypto_shash_update(hmacmd5, (char *)user, 2 * len);
(char *)user, 2 * len);
kfree(user); kfree(user);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not update with user\n", __func__); cifs_dbg(VFS, "%s: Could not update with user, rc=%d\n", __func__, rc);
return rc; return rc;
} }
...@@ -474,19 +465,15 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, ...@@ -474,19 +465,15 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
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)
rc = -ENOMEM; return -ENOMEM;
return rc;
}
len = cifs_strtoUTF16((__le16 *)domain, ses->domainName, len, len = cifs_strtoUTF16((__le16 *)domain, ses->domainName, len,
nls_cp); nls_cp);
rc = rc = crypto_shash_update(hmacmd5, (char *)domain, 2 * len);
crypto_shash_update(ses->server->secmech.hmacmd5,
(char *)domain, 2 * len);
kfree(domain); kfree(domain);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not update with domain\n", cifs_dbg(VFS, "%s: Could not update with domain, rc=%d\n", __func__, rc);
__func__);
return rc; return rc;
} }
} else { } else {
...@@ -494,33 +481,27 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash, ...@@ -494,33 +481,27 @@ static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
len = strlen(ses->ip_addr); len = strlen(ses->ip_addr);
server = kmalloc(2 + (len * 2), GFP_KERNEL); server = kmalloc(2 + (len * 2), GFP_KERNEL);
if (server == NULL) { if (server == NULL)
rc = -ENOMEM; return -ENOMEM;
return rc;
} len = cifs_strtoUTF16((__le16 *)server, ses->ip_addr, len, nls_cp);
len = cifs_strtoUTF16((__le16 *)server, ses->ip_addr, len, rc = crypto_shash_update(hmacmd5, (char *)server, 2 * len);
nls_cp);
rc =
crypto_shash_update(ses->server->secmech.hmacmd5,
(char *)server, 2 * len);
kfree(server); kfree(server);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not update with server\n", cifs_dbg(VFS, "%s: Could not update with server, rc=%d\n", __func__, rc);
__func__);
return rc; return rc;
} }
} }
rc = crypto_shash_final(ses->server->secmech.hmacmd5, rc = crypto_shash_final(hmacmd5, ntlmv2_hash);
ntlmv2_hash);
if (rc) if (rc)
cifs_dbg(VFS, "%s: Could not generate md5 hash\n", __func__); cifs_dbg(VFS, "%s: Could not generate MD5 hash, rc=%d\n", __func__, rc);
return rc; return rc;
} }
static int static int
CalcNTLMv2_response(const struct cifs_ses *ses, char *ntlmv2_hash) CalcNTLMv2_response(const struct cifs_ses *ses, char *ntlmv2_hash, struct shash_desc *hmacmd5)
{ {
int rc; int rc;
struct ntlmv2_resp *ntlmv2 = (struct ntlmv2_resp *) struct ntlmv2_resp *ntlmv2 = (struct ntlmv2_resp *)
...@@ -531,43 +512,33 @@ CalcNTLMv2_response(const struct cifs_ses *ses, char *ntlmv2_hash) ...@@ -531,43 +512,33 @@ CalcNTLMv2_response(const struct cifs_ses *ses, char *ntlmv2_hash)
hash_len = ses->auth_key.len - (CIFS_SESS_KEY_SIZE + hash_len = ses->auth_key.len - (CIFS_SESS_KEY_SIZE +
offsetof(struct ntlmv2_resp, challenge.key[0])); offsetof(struct ntlmv2_resp, challenge.key[0]));
if (!ses->server->secmech.hmacmd5) { rc = crypto_shash_setkey(hmacmd5->tfm, ntlmv2_hash, CIFS_HMAC_MD5_HASH_SIZE);
cifs_dbg(VFS, "%s: can't generate ntlmv2 hash\n", __func__);
return -1;
}
rc = crypto_shash_setkey(ses->server->secmech.hmacmd5->tfm,
ntlmv2_hash, CIFS_HMAC_MD5_HASH_SIZE);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not set NTLMV2 Hash as a key\n", cifs_dbg(VFS, "%s: Could not set NTLMv2 hash as a key, rc=%d\n", __func__, rc);
__func__);
return rc; return rc;
} }
rc = crypto_shash_init(ses->server->secmech.hmacmd5); rc = crypto_shash_init(hmacmd5);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not init hmacmd5\n", __func__); cifs_dbg(VFS, "%s: Could not init HMAC-MD5, rc=%d\n", __func__, rc);
return rc; return rc;
} }
if (ses->server->negflavor == CIFS_NEGFLAVOR_EXTENDED) if (ses->server->negflavor == CIFS_NEGFLAVOR_EXTENDED)
memcpy(ntlmv2->challenge.key, memcpy(ntlmv2->challenge.key, ses->ntlmssp->cryptkey, CIFS_SERVER_CHALLENGE_SIZE);
ses->ntlmssp->cryptkey, CIFS_SERVER_CHALLENGE_SIZE);
else else
memcpy(ntlmv2->challenge.key, memcpy(ntlmv2->challenge.key, ses->server->cryptkey, CIFS_SERVER_CHALLENGE_SIZE);
ses->server->cryptkey, CIFS_SERVER_CHALLENGE_SIZE);
rc = crypto_shash_update(ses->server->secmech.hmacmd5, rc = crypto_shash_update(hmacmd5, ntlmv2->challenge.key, hash_len);
ntlmv2->challenge.key, hash_len);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not update with response\n", __func__); cifs_dbg(VFS, "%s: Could not update with response, rc=%d\n", __func__, rc);
return rc; return rc;
} }
/* Note that the MD5 digest over writes anon.challenge_key.key */ /* Note that the MD5 digest over writes anon.challenge_key.key */
rc = crypto_shash_final(ses->server->secmech.hmacmd5, rc = crypto_shash_final(hmacmd5, ntlmv2->ntlmv2_hash);
ntlmv2->ntlmv2_hash);
if (rc) if (rc)
cifs_dbg(VFS, "%s: Could not generate md5 hash\n", __func__); cifs_dbg(VFS, "%s: Could not generate MD5 hash, rc=%d\n", __func__, rc);
return rc; return rc;
} }
...@@ -575,6 +546,7 @@ CalcNTLMv2_response(const struct cifs_ses *ses, char *ntlmv2_hash) ...@@ -575,6 +546,7 @@ CalcNTLMv2_response(const struct cifs_ses *ses, char *ntlmv2_hash)
int int
setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp) setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp)
{ {
struct shash_desc *hmacmd5 = NULL;
int rc; int rc;
int baselen; int baselen;
unsigned int tilen; unsigned int tilen;
...@@ -640,55 +612,51 @@ setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp) ...@@ -640,55 +612,51 @@ setup_ntlmv2_rsp(struct cifs_ses *ses, const struct nls_table *nls_cp)
cifs_server_lock(ses->server); cifs_server_lock(ses->server);
rc = cifs_alloc_hash("hmac(md5)", &ses->server->secmech.hmacmd5); rc = cifs_alloc_hash("hmac(md5)", &hmacmd5);
if (rc) { if (rc) {
cifs_dbg(VFS, "Could not allocate HMAC-MD5, rc=%d\n", rc);
goto unlock; goto unlock;
} }
/* calculate ntlmv2_hash */ /* calculate ntlmv2_hash */
rc = calc_ntlmv2_hash(ses, ntlmv2_hash, nls_cp); rc = calc_ntlmv2_hash(ses, ntlmv2_hash, nls_cp, hmacmd5);
if (rc) { if (rc) {
cifs_dbg(VFS, "Could not get v2 hash rc %d\n", rc); cifs_dbg(VFS, "Could not get NTLMv2 hash, rc=%d\n", rc);
goto unlock; goto unlock;
} }
/* calculate first part of the client response (CR1) */ /* calculate first part of the client response (CR1) */
rc = CalcNTLMv2_response(ses, ntlmv2_hash); rc = CalcNTLMv2_response(ses, ntlmv2_hash, hmacmd5);
if (rc) { if (rc) {
cifs_dbg(VFS, "Could not calculate CR1 rc: %d\n", rc); cifs_dbg(VFS, "Could not calculate CR1, rc=%d\n", rc);
goto unlock; goto unlock;
} }
/* now calculate the session key for NTLMv2 */ /* now calculate the session key for NTLMv2 */
rc = crypto_shash_setkey(ses->server->secmech.hmacmd5->tfm, rc = crypto_shash_setkey(hmacmd5->tfm, ntlmv2_hash, CIFS_HMAC_MD5_HASH_SIZE);
ntlmv2_hash, CIFS_HMAC_MD5_HASH_SIZE);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not set NTLMV2 Hash as a key\n", cifs_dbg(VFS, "%s: Could not set NTLMv2 hash as a key, rc=%d\n", __func__, rc);
__func__);
goto unlock; goto unlock;
} }
rc = crypto_shash_init(ses->server->secmech.hmacmd5); rc = crypto_shash_init(hmacmd5);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not init hmacmd5\n", __func__); cifs_dbg(VFS, "%s: Could not init HMAC-MD5, rc=%d\n", __func__, rc);
goto unlock; goto unlock;
} }
rc = crypto_shash_update(ses->server->secmech.hmacmd5, rc = crypto_shash_update(hmacmd5, ntlmv2->ntlmv2_hash, CIFS_HMAC_MD5_HASH_SIZE);
ntlmv2->ntlmv2_hash,
CIFS_HMAC_MD5_HASH_SIZE);
if (rc) { if (rc) {
cifs_dbg(VFS, "%s: Could not update with response\n", __func__); cifs_dbg(VFS, "%s: Could not update with response, rc=%d\n", __func__, rc);
goto unlock; goto unlock;
} }
rc = crypto_shash_final(ses->server->secmech.hmacmd5, rc = crypto_shash_final(hmacmd5, ses->auth_key.response);
ses->auth_key.response);
if (rc) if (rc)
cifs_dbg(VFS, "%s: Could not generate md5 hash\n", __func__); cifs_dbg(VFS, "%s: Could not generate MD5 hash, rc=%d\n", __func__, rc);
unlock: unlock:
cifs_server_unlock(ses->server); cifs_server_unlock(ses->server);
cifs_free_hash(&hmacmd5);
setup_ntlmv2_rsp_ret: setup_ntlmv2_rsp_ret:
kfree_sensitive(tiblob); kfree_sensitive(tiblob);
...@@ -733,7 +701,6 @@ cifs_crypto_secmech_release(struct TCP_Server_Info *server) ...@@ -733,7 +701,6 @@ cifs_crypto_secmech_release(struct TCP_Server_Info *server)
cifs_free_hash(&server->secmech.hmacsha256); cifs_free_hash(&server->secmech.hmacsha256);
cifs_free_hash(&server->secmech.md5); cifs_free_hash(&server->secmech.md5);
cifs_free_hash(&server->secmech.sha512); cifs_free_hash(&server->secmech.sha512);
cifs_free_hash(&server->secmech.hmacmd5);
if (!SERVER_IS_CHAN(server)) { if (!SERVER_IS_CHAN(server)) {
if (server->secmech.enc) { if (server->secmech.enc) {
......
fs/smb/client/cifsglob.h
View file @ db44ca9f
...@@ -178,7 +178,6 @@ struct session_key { ...@@ -178,7 +178,6 @@ struct session_key {
/* crypto hashing related structure/fields, not specific to a sec mech */ /* crypto hashing related structure/fields, not specific to a sec mech */
struct cifs_secmech { struct cifs_secmech {
struct shash_desc *hmacmd5; /* hmacmd5 hash function, for NTLMv2/CR1 hashes */
struct shash_desc *md5; /* md5 hash function, for CIFS/SMB1 signatures */ struct shash_desc *md5; /* md5 hash function, for CIFS/SMB1 signatures */
struct shash_desc *hmacsha256; /* hmac-sha256 hash function, for SMB2 signatures */ struct shash_desc *hmacsha256; /* hmac-sha256 hash function, for SMB2 signatures */
struct shash_desc *sha512; /* sha512 hash function, for SMB3.1.1 preauth hash */ struct shash_desc *sha512; /* sha512 hash function, for SMB3.1.1 preauth hash */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7