From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 03 Jan 2024 09:43:39 +0000 Subject: [PATCH] update kernel to 5.10.198 --- kernel/net/sunrpc/auth_gss/gss_krb5_keys.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/kernel/net/sunrpc/auth_gss/gss_krb5_keys.c b/kernel/net/sunrpc/auth_gss/gss_krb5_keys.c index f7fe2d2..726c076 100644 --- a/kernel/net/sunrpc/auth_gss/gss_krb5_keys.c +++ b/kernel/net/sunrpc/auth_gss/gss_krb5_keys.c @@ -147,7 +147,7 @@ size_t blocksize, keybytes, keylength, n; unsigned char *inblockdata, *outblockdata, *rawkey; struct xdr_netobj inblock, outblock; - struct crypto_skcipher *cipher; + struct crypto_sync_skcipher *cipher; u32 ret = EINVAL; blocksize = gk5e->blocksize; @@ -157,11 +157,10 @@ if ((inkey->len != keylength) || (outkey->len != keylength)) goto err_return; - cipher = crypto_alloc_skcipher(gk5e->encrypt_name, 0, - CRYPTO_ALG_ASYNC); + cipher = crypto_alloc_sync_skcipher(gk5e->encrypt_name, 0, 0); if (IS_ERR(cipher)) goto err_return; - if (crypto_skcipher_setkey(cipher, inkey->data, inkey->len)) + if (crypto_sync_skcipher_setkey(cipher, inkey->data, inkey->len)) goto err_return; /* allocate and set up buffers */ @@ -229,16 +228,13 @@ ret = 0; err_free_raw: - memset(rawkey, 0, keybytes); - kfree(rawkey); + kfree_sensitive(rawkey); err_free_out: - memset(outblockdata, 0, blocksize); - kfree(outblockdata); + kfree_sensitive(outblockdata); err_free_in: - memset(inblockdata, 0, blocksize); - kfree(inblockdata); + kfree_sensitive(inblockdata); err_free_cipher: - crypto_free_skcipher(cipher); + crypto_free_sync_skcipher(cipher); err_return: return ret; } -- Gitblit v1.6.2