Patch "crypto: mcryptd - pass through absence of ->setkey()" has been added to the 3.18-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
crypto: mcryptd - pass through absence of ->setkey()
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
crypto-mcryptd-pass-through-absence-of-setkey.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
fa59b92d299f2787e6bae1ff078ee0982e80211fMon Sep 17 00:00:00 2001
From: Eric Biggers <[email protected]>
Date: Wed, 3 Jan 2018 11:16:24 -0800
Subject: crypto: mcryptd - pass through absence of ->setkey()
From: Eric Biggers <[email protected]>
commit fa59b92d299f2787e6bae1ff078ee0982e80211f upstream.
When the mcryptd template is used to wrap an unkeyed hash algorithm, don't install a ->setkey() method to the mcryptd instance. This change is necessary for mcryptd to keep working with unkeyed hash algorithms once we start enforcing that ->setkey() is called when present.
--- crypto/mcryptd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
crypto/mcryptd.c +2 -1
@@ -514,7 +514,8 @@ static int mcryptd_create_hash(struct cr inst->alg.finup = mcryptd_hash_finup_enqueue; inst->alg.export = mcryptd_hash_export; inst->alg.import = mcryptd_hash_import; - inst->alg.setkey = mcryptd_hash_setkey; +if (crypto_hash_alg_has_setkey (halg)) + inst->alg.setkey = mcryptd_hash_setkey; inst->alg.digest = mcryptd_hash_digest_enqueue; err =ahash_register_instance (tmpl, inst);
Patches currently in stable-queue which might be from [email protected] are
queue-3.18/crypto-cryptd-pass-through-absence-of-setkey.patch queue-3.18/keys-encrypted-fix-buffer-overread-in-valid_master_desc.patch queue-3.18/crypto-hash-introduce-crypto_hash_alg_has_setkey.patch queue-3.18/crypto-mcryptd-pass-through-absence-of-setkey.patch
Greg KH
maintainerQuoted 8 lines · On Wed, Feb 14, 2018 at 07:57:18PM +0100, [email protected] wrote:
This is a note to let you know that I've just added the patch titled
crypto: mcryptd - pass through absence of ->setkey()to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
Quoted 6 lines
The filename of the patch is:
crypto-mcryptd-pass-through-absence-of-setkey.patch
and it can be found in the queue-3.18 subdirectory.If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Nope, this breaks the build, now dropped :(