Skip to contentSkip to conversation

Patch "staging: ccree: fix leak of import() after init()" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Dec 7, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

staging: ccree: fix leak of import() after init()

to the 4.14-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:
staging-ccree-fix-leak-of-import-after-init.patch
and it can be found in the queue-4.14 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 c5f39d07860c35e5e4c63188139465af790f86ce Mon Sep 17 00:00:00 2001

From: Gilad Ben-Yossef <[email protected]>
Date: Thu, 9 Nov 2017 09:16:09 +0000
Subject: staging: ccree: fix leak of import() after init()

From: Gilad Ben-Yossef <[email protected]>

commit c5f39d07860c35e5e4c63188139465af790f86ce upstream.

crypto_ahash_import() may be called either after crypto_ahash_init() or without such call. Right now we always internally call init() as part of import(), thus leaking memory and mappings if the user has already called init() herself.

Fix this by only calling init() internally if the
state is not already initialized.

Fixes commit 454527d0d94f ("staging: ccree: fix hash import/export")
---
 drivers/staging/ccree/ssi_hash.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/staging/ccree/ssi_hash.c +6 -3
@@ -1790,9 +1790,12 @@ static int ssi_ahash_import(struct ahash
 	}
 	in += sizeof(u32);
 
-	rc = ssi_hash_init(state, ctx);
-	if (rc)
-		goto out;
+	/* call init() to allocate bufs if the user hasn't */
+	if (!state->digest_buff) {
+		rc = ssi_hash_init(state, ctx);
+		if (rc)
+			goto out;
+	}
 
 	dma_sync_single_for_cpu(dev, state->digest_buff_dma_addr,
 				ctx->inter_digestsize, DMA_BIDIRECTIONAL);

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/staging-ccree-fix-leak-of-import-after-init.patch