From: Namjae Jeon <namjae.jeon@samsung.com>
Date: Wed, 26 May 2021 06:25:40 +0000 (+0900)
Subject: cifsd: move fips_enabled check before the str_to_key()
X-Git-Tag: v5.15-rc1~183^2~18^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94096702376ecb99c86cbee9dd95fc3675231b8a;p=thirdparty%2Fkernel%2Fstable.git

cifsd: move fips_enabled check before the str_to_key()

Move fips_enabled check before the str_to_key().

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
---

diff --git a/fs/cifsd/auth.c b/fs/cifsd/auth.c
index 6b90aac86fccc..9263c9ce2dd2e 100644
--- a/fs/cifsd/auth.c
+++ b/fs/cifsd/auth.c
@@ -92,14 +92,13 @@ smbhash(unsigned char *out, const unsigned char *in, unsigned char *key)
 	unsigned char key2[8];
 	struct des_ctx ctx;
 
-	str_to_key(key, key2);
-
 	if (fips_enabled) {
 		ksmbd_debug(AUTH,
 			"FIPS compliance enabled: DES not permitted\n");
 		return -ENOENT;
 	}
 
+	str_to_key(key, key2);
 	des_expand_key(&ctx, key2, DES_KEY_SIZE);
 	des_encrypt(&ctx, out, in);
 	memzero_explicit(&ctx, sizeof(ctx));