Patch "crypto: pcrypt - fix freeing pcrypt instances" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
crypto: pcrypt - fix freeing pcrypt instances
to the 4.4-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-pcrypt-fix-freeing-pcrypt-instances.patch
and it can be found in the queue-4.4 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
d76c68109f37cb85b243a1cf0f40313afd2bae68Mon Sep 17 00:00:00 2001
From: Eric Biggers <[email protected]>
Date: Wed, 20 Dec 2017 14:28:25 -0800
Subject: crypto: pcrypt - fix freeing pcrypt instances
From: Eric Biggers <[email protected]>
commit d76c68109f37cb85b243a1cf0f40313afd2bae68 upstream.
pcrypt is using the old way of freeing instances, where the ->free() method specified in the 'struct crypto_template' is passed a pointer to the 'struct crypto_instance'. But the crypto_instance is being kfree()'d directly, which is incorrect because the memory was actually allocated as an aead_instance, which contains the crypto_instance at a nonzero offset. Thus, the wrong pointer was being kfree()'d.
Fix it by switching to the new way to free aead_instance's where the ->free() method is specified in the aead_instance itself.
--- crypto/pcrypt.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
crypto/pcrypt.c +10 -9
@@ -254,6 +254,14 @@ static void pcrypt_aead_exit_tfm(structcrypto_free_aead (ctx->child); } +static void pcrypt_free (struct aead_instance *inst) +{ +struct pcrypt_instance_ctx *ctx =aead_instance_ctx (inst); + +crypto_drop_aead (&ctx->spawn); +kfree (inst); +} +static int pcrypt_init_instance (struct crypto_instance *inst,struct crypto_alg *alg) {
@@ -319,6 +327,8 @@ static int pcrypt_create_aead(struct cry inst->alg.encrypt = pcrypt_aead_encrypt; inst->alg.decrypt = pcrypt_aead_decrypt; + inst->free = pcrypt_free; + err =aead_register_instance (tmpl, inst);if (err) goto out_drop_aead;
@@ -349,14 +359,6 @@ static int pcrypt_create(struct crypto_treturn -EINVAL ; } -static void pcrypt_free (struct crypto_instance *inst) -{ -struct pcrypt_instance_ctx *ctx =crypto_instance_ctx (inst); - -crypto_drop_aead (&ctx->spawn); -kfree (inst); -} -static int pcrypt_cpumask_change_notify (struct notifier_block *self,unsigned long val,void *data) {
@@ -469,7 +471,6 @@ static void pcrypt_fini_padata(struct pastatic struct crypto_template pcrypt_tmpl = { .name ="pcrypt" , .create = pcrypt_create, - .free = pcrypt_free, .module =THIS_MODULE , };
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/crypto-chacha20poly1305-validate-the-digest-size.patch queue-4.4/crypto-pcrypt-fix-freeing-pcrypt-instances.patch