Skip to contentSkip to conversation

Patch "crypto: caam - fix RNG deinstantiation error checking" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Apr 12, 2017

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: caam - fix RNG deinstantiation error checking

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-caam-fix-rng-deinstantiation-error-checking.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 40c98cb57cdbc377456116ad4582c89e329721b0 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Horia=20Geant=C4=83?= <[email protected]>
Date: Wed, 5 Apr 2017 11:41:03 +0300
Subject: crypto: caam - fix RNG deinstantiation error checking
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Horia Geantă <[email protected]>

commit 40c98cb57cdbc377456116ad4582c89e329721b0 upstream.

RNG instantiation was previously fixed by
commit 62743a4145bb9 ("crypto: caam - fix RNG init descriptor ret. code checking") while deinstantiation was not addressed.

Since the descriptors used are similar, in the sense that they both end with a JUMP HALT command, checking for errors should be similar too, i.e. status code 7000_0000h should be considered successful.

Fixes 1005bccd7a4a6 ("crypto: caam - enable instantiation of all RNG4 state handles")
---
 drivers/crypto/caam/ctrl.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/caam/ctrl.c +2 -1
@@ -278,7 +278,8 @@ static int deinstantiate_rng(struct devi
 			/* Try to run it through DECO0 */
 			ret = run_descriptor_deco0(ctrldev, desc, &status);
 
-			if (ret || status) {
+			if (ret ||
+			    (status && status != JRSTA_SSRC_JUMP_HALT_CC)) {
 				dev_err(ctrldev,
 					"Failed to deinstantiate RNG4 SH%d\n",
 					sh_idx);

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

queue-4.4/crypto-caam-fix-rng-deinstantiation-error-checking.patch