Skip to contentSkip to conversation

Patch "crypto: ccp - Fill the result buffer only on digest, finup, and final ops" has been added to the 4.16-stable tree

PATCH [email protected] 1 participant 1 message Apr 5, 2018

Subsystems (3)
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

crypto: ccp - Fill the result buffer only on digest, finup, and final ops

to the 4.16-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-ccp-fill-the-result-buffer-only-on-digest-finup-and-final-ops.patch
and it can be found in the queue-4.16 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 0ee991be4cdd88587aedbf68cdacd1765f57236a Mon Sep 17 00:00:00 2001

From: Gary R Hook <[email protected]>
Date: Wed, 7 Mar 2018 11:37:42 -0600
Subject: crypto: ccp - Fill the result buffer only on digest, finup, and final ops

From: Gary R Hook <[email protected]>

commit 0ee991be4cdd88587aedbf68cdacd1765f57236a upstream.

Any change to the result buffer should only happen on final, finup and digest operations. Changes to the buffer for update, import, export, etc, are not allowed.

Fixes 66d7b9f6175e ("crypto: testmgr - test misuse of result in ahash")
---
 drivers/crypto/ccp/ccp-crypto-aes-cmac.c |    2 +-
 drivers/crypto/ccp/ccp-crypto-sha.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/ccp/ccp-crypto-aes-cmac.c +1 -1
@@ -46,7 +46,7 @@ static int ccp_aes_cmac_complete(struct
 	}
 
 	/* Update result area if supplied */
-	if (req->result)
+	if (req->result && rctx->final)
 		memcpy(req->result, rctx->iv, digest_size);
 
 e_free:
drivers/crypto/ccp/ccp-crypto-sha.c +1 -1
@@ -47,7 +47,7 @@ static int ccp_sha_complete(struct crypt
 	}
 
 	/* Update result area if supplied */
-	if (req->result)
+	if (req->result && rctx->final)
 		memcpy(req->result, rctx->ctx, digest_size);
 
 e_free:

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

queue-4.16/crypto-ccp-fill-the-result-buffer-only-on-digest-finup-and-final-ops.patch queue-4.16/crypto-ccp-return-an-actual-key-size-from-rsa-max_size-callback.patch