Patch "crypto: marvell - Don't overwrite default creq->state during initialization" has been added to the 4.8-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
crypto: marvell - Don't overwrite default creq->state during initialization
to the 4.8-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-marvell-don-t-overwrite-default-creq-state-during-initialization.patch
and it can be found in the queue-4.8 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
57cfda1ac74e58767f6305bd1ea3449177425460Mon Sep 17 00:00:00 2001
From: Romain Perier <[email protected]>
Date: Tue, 9 Aug 2016 11:03:19 +0200
Subject: crypto: marvell - Don't overwrite default creq->state during initialization
From: Romain Perier <[email protected]>
commit 57cfda1ac74e58767f6305bd1ea3449177425460 upstream.
Currently, in mv_cesa_{md5,sha1,sha256}_init creq->state is initialized before the call to mv_cesa_ahash_init. This is wrong because this function fills creq with zero by using memset, so its 'state' that contains the default DIGEST is overwritten. This commit fixes the issue by initializing creq->state just after the call to mv_cesa_ahash_init.
--- drivers/crypto/marvell/hash.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/crypto/marvell/hash.c +9 -6
@@ -805,13 +805,14 @@ static int mv_cesa_md5_init(struct ahashstruct mv_cesa_op_ctx tmpl = { };mv_cesa_set_op_cfg (&tmpl,CESA_SA_DESC_CFG_MACM_MD5 ); + +mv_cesa_ahash_init (req, &tmpl, true); + creq->state[0 ] =MD5_H0 ; creq->state[1 ] =MD5_H1 ; creq->state[2 ] =MD5_H2 ; creq->state[3 ] =MD5_H3 ; -mv_cesa_ahash_init (req, &tmpl, true); -return 0 ; }
@@ -873,14 +874,15 @@ static int mv_cesa_sha1_init(struct ahasstruct mv_cesa_op_ctx tmpl = { };mv_cesa_set_op_cfg (&tmpl,CESA_SA_DESC_CFG_MACM_SHA1 ); + +mv_cesa_ahash_init (req, &tmpl, false); + creq->state[0 ] =SHA1_H0 ; creq->state[1 ] =SHA1_H1 ; creq->state[2 ] =SHA1_H2 ; creq->state[3 ] =SHA1_H3 ; creq->state[4 ] =SHA1_H4 ; -mv_cesa_ahash_init (req, &tmpl, false); -return 0 ; }
@@ -942,6 +944,9 @@ static int mv_cesa_sha256_init(struct ahstruct mv_cesa_op_ctx tmpl = { };mv_cesa_set_op_cfg (&tmpl,CESA_SA_DESC_CFG_MACM_SHA256 ); + +mv_cesa_ahash_init (req, &tmpl, false); + creq->state[0 ] =SHA256_H0 ; creq->state[1 ] =SHA256_H1 ; creq->state[2 ] =SHA256_H2 ;
@@ -951,8 +956,6 @@ static int mv_cesa_sha256_init(struct ah creq->state[6 ] =SHA256_H6 ; creq->state[7 ] =SHA256_H7 ; -mv_cesa_ahash_init (req, &tmpl, false); -return 0 ; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.8/crypto-marvell-don-t-overwrite-default-creq-state-during-initialization.patch queue-4.8/crypto-marvell-update-transformation-context-for-each-dequeued-req.patch