Skip to content

Commit f3aefb6

Browse files
ebiggersJ. Bruce Fields
authored andcommitted
sunrpc: remove incorrect HMAC request initialization
make_checksum_hmac_md5() is allocating an HMAC transform and doing crypto API calls in the following order: crypto_ahash_init() crypto_ahash_setkey() crypto_ahash_digest() This is wrong because it makes no sense to init() the request before a key has been set, given that the initial state depends on the key. And digest() is short for init() + update() + final(), so in this case there's no need to explicitly call init() at all. Before commit 9fa68f6 ("crypto: hash - prevent using keyed hashes without setting key") the extra init() had no real effect, at least for the software HMAC implementation. (There are also hardware drivers that implement HMAC-MD5, and it's not immediately obvious how gracefully they handle init() before setkey().) But now the crypto API detects this incorrect initialization and returns -ENOKEY. This is breaking NFS mounts in some cases. Fix it by removing the incorrect call to crypto_ahash_init(). Reported-by: Michael Young <[email protected]> Fixes: 9fa68f6 ("crypto: hash - prevent using keyed hashes without setting key") Fixes: fffdaef ("gss_krb5: Add support for rc4-hmac encryption") Cc: [email protected] Signed-off-by: Eric Biggers <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]>
1 parent 38a7031 commit f3aefb6

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

net/sunrpc/auth_gss/gss_krb5_crypto.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,6 @@ make_checksum_hmac_md5(struct krb5_ctx *kctx, char *header, int hdrlen,
237237

238238
ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_SLEEP, NULL, NULL);
239239

240-
err = crypto_ahash_init(req);
241-
if (err)
242-
goto out;
243240
err = crypto_ahash_setkey(hmac_md5, cksumkey, kctx->gk5e->keylength);
244241
if (err)
245242
goto out;

0 commit comments

Comments
 (0)