Commit 3a597e6e authored by Eric Biggers's avatar Eric Biggers Committed by Steve French
Browse files

ksmbd: Use HMAC-MD5 library for NTLMv2 



For the HMAC-MD5 computations in NTLMv2, use the HMAC-MD5 library
instead of a "hmac(md5)" crypto_shash.  This is simpler and faster.
With the library there's no need to allocate memory, no need to handle
errors, and the HMAC-MD5 code is accessed directly without inefficient
indirect calls and other unnecessary API overhead.

To preserve the existing behavior of NTLMv2 support being disabled when
the kernel is booted with "fips=1", make ksmbd_auth_ntlmv2() check
fips_enabled itself.  Previously it relied on the error from
crypto_alloc_shash("hmac(md5)") being bubbled up.  I don't know for sure
that this is actually needed, but this preserves the existing behavior.

Signed-off-by: default avatarEric Biggers <ebiggers@kernel.org>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 924067ef

fs/smb/server/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -7,11 +7,10 @@ config SMB_SERVER 
	select NLS_UTF8

	select NLS_UCS2_UTILS

	select CRYPTO

	select CRYPTO_MD5

	select CRYPTO_HMAC

	select CRYPTO_ECB

	select CRYPTO_LIB_ARC4

	select CRYPTO_LIB_DES

	select CRYPTO_LIB_MD5

	select CRYPTO_LIB_SHA256

	select CRYPTO_LIB_SHA512

	select CRYPTO_CMAC

fs/smb/server/auth.c

+25 −148
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/xattr.h>

#include <crypto/hash.h>

#include <crypto/aead.h>

#include <crypto/md5.h>

#include <crypto/sha2.h>

#include <linux/random.h>

#include <linux/scatterlist.h>
@@ -70,85 +71,16 @@ void ksmbd_copy_gss_neg_header(void *buf) 
	memcpy(buf, NEGOTIATE_GSS_HEADER, AUTH_GSS_LENGTH);

}



/**

 * ksmbd_gen_sess_key() - function to generate session key

 * @sess:	session of connection

 * @hash:	source hash value to be used for find session key

 * @hmac:	source hmac value to be used for finding session key

 *

 */

static int ksmbd_gen_sess_key(struct ksmbd_session *sess, char *hash,

			      char *hmac)

{

	struct ksmbd_crypto_ctx *ctx;

	int rc;



	ctx = ksmbd_crypto_ctx_find_hmacmd5();

	if (!ctx) {

		ksmbd_debug(AUTH, "could not crypto alloc hmacmd5\n");

		return -ENOMEM;

	}



	rc = crypto_shash_setkey(CRYPTO_HMACMD5_TFM(ctx),

				 hash,

				 CIFS_HMAC_MD5_HASH_SIZE);

	if (rc) {

		ksmbd_debug(AUTH, "hmacmd5 set key fail error %d\n", rc);

		goto out;

	}



	rc = crypto_shash_init(CRYPTO_HMACMD5(ctx));

	if (rc) {

		ksmbd_debug(AUTH, "could not init hmacmd5 error %d\n", rc);

		goto out;

	}



	rc = crypto_shash_update(CRYPTO_HMACMD5(ctx),

				 hmac,

				 SMB2_NTLMV2_SESSKEY_SIZE);

	if (rc) {

		ksmbd_debug(AUTH, "Could not update with response error %d\n", rc);

		goto out;

	}



	rc = crypto_shash_final(CRYPTO_HMACMD5(ctx), sess->sess_key);

	if (rc) {

		ksmbd_debug(AUTH, "Could not generate hmacmd5 hash error %d\n", rc);

		goto out;

	}



out:

	ksmbd_release_crypto_ctx(ctx);

	return rc;

}



static int calc_ntlmv2_hash(struct ksmbd_conn *conn, struct ksmbd_session *sess,

			    char *ntlmv2_hash, char *dname)

{

	int ret, len, conv_len;

	wchar_t *domain = NULL;

	__le16 *uniname = NULL;

	struct ksmbd_crypto_ctx *ctx;



	ctx = ksmbd_crypto_ctx_find_hmacmd5();

	if (!ctx) {

		ksmbd_debug(AUTH, "can't generate ntlmv2 hash\n");

		return -ENOMEM;

	}

	struct hmac_md5_ctx ctx;



	ret = crypto_shash_setkey(CRYPTO_HMACMD5_TFM(ctx),

				  user_passkey(sess->user),

	hmac_md5_init_usingrawkey(&ctx, user_passkey(sess->user),

				  CIFS_ENCPWD_SIZE);

	if (ret) {

		ksmbd_debug(AUTH, "Could not set NT Hash as a key\n");

		goto out;

	}



	ret = crypto_shash_init(CRYPTO_HMACMD5(ctx));

	if (ret) {

		ksmbd_debug(AUTH, "could not init hmacmd5\n");

		goto out;

	}



	/* convert user_name to unicode */

	len = strlen(user_name(sess->user));
@@ -166,13 +98,7 @@ static int calc_ntlmv2_hash(struct ksmbd_conn *conn, struct ksmbd_session *sess, 
	}

	UniStrupr(uniname);



	ret = crypto_shash_update(CRYPTO_HMACMD5(ctx),

				  (char *)uniname,

				  UNICODE_LEN(conv_len));

	if (ret) {

		ksmbd_debug(AUTH, "Could not update with user\n");

		goto out;

	}

	hmac_md5_update(&ctx, (const u8 *)uniname, UNICODE_LEN(conv_len));



	/* Convert domain name or conn name to unicode and uppercase */

	len = strlen(dname);
@@ -189,21 +115,12 @@ static int calc_ntlmv2_hash(struct ksmbd_conn *conn, struct ksmbd_session *sess, 
		goto out;

	}



	ret = crypto_shash_update(CRYPTO_HMACMD5(ctx),

				  (char *)domain,

				  UNICODE_LEN(conv_len));

	if (ret) {

		ksmbd_debug(AUTH, "Could not update with domain\n");

		goto out;

	}



	ret = crypto_shash_final(CRYPTO_HMACMD5(ctx), ntlmv2_hash);

	if (ret)

		ksmbd_debug(AUTH, "Could not generate md5 hash\n");

	hmac_md5_update(&ctx, (const u8 *)domain, UNICODE_LEN(conv_len));

	hmac_md5_final(&ctx, ntlmv2_hash);

	ret = 0;

out:

	kfree(uniname);

	kfree(domain);

	ksmbd_release_crypto_ctx(ctx);

	return ret;

}
@@ -224,73 +141,33 @@ int ksmbd_auth_ntlmv2(struct ksmbd_conn *conn, struct ksmbd_session *sess, 
{

	char ntlmv2_hash[CIFS_ENCPWD_SIZE];

	char ntlmv2_rsp[CIFS_HMAC_MD5_HASH_SIZE];

	struct ksmbd_crypto_ctx *ctx = NULL;

	char *construct = NULL;

	int rc, len;



	rc = calc_ntlmv2_hash(conn, sess, ntlmv2_hash, domain_name);

	if (rc) {

		ksmbd_debug(AUTH, "could not get v2 hash rc %d\n", rc);

		goto out;

	}



	ctx = ksmbd_crypto_ctx_find_hmacmd5();

	if (!ctx) {

		ksmbd_debug(AUTH, "could not crypto alloc hmacmd5\n");

		return -ENOMEM;

	}



	rc = crypto_shash_setkey(CRYPTO_HMACMD5_TFM(ctx),

				 ntlmv2_hash,

				 CIFS_HMAC_MD5_HASH_SIZE);

	if (rc) {

		ksmbd_debug(AUTH, "Could not set NTLMV2 Hash as a key\n");

		goto out;

	}



	rc = crypto_shash_init(CRYPTO_HMACMD5(ctx));

	if (rc) {

		ksmbd_debug(AUTH, "Could not init hmacmd5\n");

		goto out;

	}

	struct hmac_md5_ctx ctx;

	int rc;



	len = CIFS_CRYPTO_KEY_SIZE + blen;

	construct = kzalloc(len, KSMBD_DEFAULT_GFP);

	if (!construct) {

		rc = -ENOMEM;

		goto out;

	if (fips_enabled) {

		ksmbd_debug(AUTH, "NTLMv2 support is disabled due to FIPS\n");

		return -EOPNOTSUPP;

	}



	memcpy(construct, cryptkey, CIFS_CRYPTO_KEY_SIZE);

	memcpy(construct + CIFS_CRYPTO_KEY_SIZE, &ntlmv2->blob_signature, blen);



	rc = crypto_shash_update(CRYPTO_HMACMD5(ctx), construct, len);

	rc = calc_ntlmv2_hash(conn, sess, ntlmv2_hash, domain_name);

	if (rc) {

		ksmbd_debug(AUTH, "Could not update with response\n");

		goto out;

		ksmbd_debug(AUTH, "could not get v2 hash rc %d\n", rc);

		return rc;

	}



	rc = crypto_shash_final(CRYPTO_HMACMD5(ctx), ntlmv2_rsp);

	if (rc) {

		ksmbd_debug(AUTH, "Could not generate md5 hash\n");

		goto out;

	}

	ksmbd_release_crypto_ctx(ctx);

	ctx = NULL;

	hmac_md5_init_usingrawkey(&ctx, ntlmv2_hash, CIFS_HMAC_MD5_HASH_SIZE);

	hmac_md5_update(&ctx, cryptkey, CIFS_CRYPTO_KEY_SIZE);

	hmac_md5_update(&ctx, (const u8 *)&ntlmv2->blob_signature, blen);

	hmac_md5_final(&ctx, ntlmv2_rsp);



	rc = ksmbd_gen_sess_key(sess, ntlmv2_hash, ntlmv2_rsp);

	if (rc) {

		ksmbd_debug(AUTH, "Could not generate sess key\n");

		goto out;

	}

	/* Generate the session key */

	hmac_md5_usingrawkey(ntlmv2_hash, CIFS_HMAC_MD5_HASH_SIZE,

			     ntlmv2_rsp, CIFS_HMAC_MD5_HASH_SIZE,

			     sess->sess_key);



	if (memcmp(ntlmv2->ntlmv2_hash, ntlmv2_rsp, CIFS_HMAC_MD5_HASH_SIZE) != 0)

		rc = -EINVAL;

out:

	if (ctx)

		ksmbd_release_crypto_ctx(ctx);

	kfree(construct);

	return rc;

		return -EINVAL;

	return 0;

}



/**

fs/smb/server/crypto_ctx.c

+0 −8
Original line number Diff line number Diff line
@@ -66,9 +66,6 @@ static struct shash_desc *alloc_shash_desc(int id) 
	struct shash_desc *shash;



	switch (id) {

	case CRYPTO_SHASH_HMACMD5:

		tfm = crypto_alloc_shash("hmac(md5)", 0, 0);

		break;

	case CRYPTO_SHASH_CMACAES:

		tfm = crypto_alloc_shash("cmac(aes)", 0, 0);

		break;
@@ -174,11 +171,6 @@ static struct ksmbd_crypto_ctx *____crypto_shash_ctx_find(int id) 
	return NULL;

}



struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_hmacmd5(void)

{

	return ____crypto_shash_ctx_find(CRYPTO_SHASH_HMACMD5);

}



struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_cmacaes(void)

{

	return ____crypto_shash_ctx_find(CRYPTO_SHASH_CMACAES);

fs/smb/server/crypto_ctx.h

+1 −5
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ 
#include <crypto/aead.h>



enum {

	CRYPTO_SHASH_HMACMD5	= 0,

	CRYPTO_SHASH_CMACAES,

	CRYPTO_SHASH_CMACAES	= 0,

	CRYPTO_SHASH_MAX,

};
@@ -33,17 +32,14 @@ struct ksmbd_crypto_ctx { 
	struct crypto_aead		*ccmaes[CRYPTO_AEAD_MAX];

};



#define CRYPTO_HMACMD5(c)	((c)->desc[CRYPTO_SHASH_HMACMD5])

#define CRYPTO_CMACAES(c)	((c)->desc[CRYPTO_SHASH_CMACAES])



#define CRYPTO_HMACMD5_TFM(c)	((c)->desc[CRYPTO_SHASH_HMACMD5]->tfm)

#define CRYPTO_CMACAES_TFM(c)	((c)->desc[CRYPTO_SHASH_CMACAES]->tfm)



#define CRYPTO_GCM(c)		((c)->ccmaes[CRYPTO_AEAD_AES_GCM])

#define CRYPTO_CCM(c)		((c)->ccmaes[CRYPTO_AEAD_AES_CCM])



void ksmbd_release_crypto_ctx(struct ksmbd_crypto_ctx *ctx);

struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_hmacmd5(void);

struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_cmacaes(void);

struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_gcm(void);

struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_ccm(void);

fs/smb/server/server.c

+0 −2
Original line number Diff line number Diff line
@@ -622,8 +622,6 @@ MODULE_AUTHOR("Namjae Jeon <linkinjeon@kernel.org>"); 
MODULE_DESCRIPTION("Linux kernel CIFS/SMB SERVER");

MODULE_LICENSE("GPL");

MODULE_SOFTDEP("pre: ecb");

MODULE_SOFTDEP("pre: hmac");

MODULE_SOFTDEP("pre: md5");

MODULE_SOFTDEP("pre: nls");

MODULE_SOFTDEP("pre: aes");

MODULE_SOFTDEP("pre: cmac");