* [PATCH 3.12.y stable] crypto: testmgr - fix 3.12.40 regression
@ 2015-04-21 16:31 Lennart Sorensen
2015-04-23 7:29 ` Jiri Slaby
0 siblings, 1 reply; 2+ messages in thread
From: Lennart Sorensen @ 2015-04-21 16:31 UTC (permalink / raw)
To: Len Sorensen; +Cc: linux-kernel, stable, Rabin Vincent, Herbert Xu, Jiri Slaby
commit ace3fc1e3f3a85ec705805146247231b11e1babe in 3.12.40 missed two
lines while pulling in commit 8a45ac12ec5b6ee67f8559c78ae11d9af8b821ee
from upstream. This causes the tests to fail in some cases.
With the two missing lines added in, the tests pass again.
Tested with omap-aes, omap-sham and talitos.
Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>
---
crypto/testmgr.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 317c31f..93e508c 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -334,6 +334,7 @@ static int __test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,
case -EBUSY:
wait_for_completion(&tresult.completion);
INIT_COMPLETION(tresult.completion);
+ ret = tresult.err;
if (!ret)
break;
/* fall through */
@@ -1079,6 +1080,7 @@ static int __test_skcipher(struct crypto_ablkcipher *tfm, int enc,
case -EBUSY:
wait_for_completion(&result.completion);
INIT_COMPLETION(result.completion);
+ ret = result.err;
if (!ret)
break;
/* fall through */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 3.12.y stable] crypto: testmgr - fix 3.12.40 regression
2015-04-21 16:31 [PATCH 3.12.y stable] crypto: testmgr - fix 3.12.40 regression Lennart Sorensen
@ 2015-04-23 7:29 ` Jiri Slaby
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Slaby @ 2015-04-23 7:29 UTC (permalink / raw)
To: Lennart Sorensen; +Cc: linux-kernel, stable, Rabin Vincent, Herbert Xu
On 04/21/2015, 06:31 PM, Lennart Sorensen wrote:
> commit ace3fc1e3f3a85ec705805146247231b11e1babe in 3.12.40 missed two
> lines while pulling in commit 8a45ac12ec5b6ee67f8559c78ae11d9af8b821ee
> from upstream. This causes the tests to fail in some cases.
>
> With the two missing lines added in, the tests pass again.
>
> Tested with omap-aes, omap-sham and talitos.
>
> Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca>
Applied, thanks!
--
js
suse labs
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-04-23 7:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-21 16:31 [PATCH 3.12.y stable] crypto: testmgr - fix 3.12.40 regression Lennart Sorensen
2015-04-23 7:29 ` Jiri Slaby
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).