From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed, 22 Apr 2015 03:02:27 +0000 (+0800)
Subject: crypto: tcrypt - Handle async return from crypto_ahash_init
X-Git-Tag: v4.1.12-92~3^2~257
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=856f6673935d0393f32976f608f388ffc670440f;p=users%2Fjedix%2Flinux-maple.git

crypto: tcrypt - Handle async return from crypto_ahash_init

Orabug: 25243093

The function crypto_ahash_init can also be asynchronous just
like update and final.  So all callers must be able to handle
an async return.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 43a9607d86e8fb110b596d300dbaae895c198fed)
Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>
---

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index df27b99b171bf..4a32ad028ba63 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -828,7 +828,7 @@ static int test_ahash_jiffies(struct ahash_request *req, int blen,
 
 	for (start = jiffies, end = start + secs * HZ, bcount = 0;
 	     time_before(jiffies, end); bcount++) {
-		ret = crypto_ahash_init(req);
+		ret = do_one_ahash_op(req, crypto_ahash_init(req));
 		if (ret)
 			return ret;
 		for (pcount = 0; pcount < blen; pcount += plen) {
@@ -897,7 +897,7 @@ static int test_ahash_cycles(struct ahash_request *req, int blen,
 
 	/* Warm-up run. */
 	for (i = 0; i < 4; i++) {
-		ret = crypto_ahash_init(req);
+		ret = do_one_ahash_op(req, crypto_ahash_init(req));
 		if (ret)
 			goto out;
 		for (pcount = 0; pcount < blen; pcount += plen) {
@@ -916,7 +916,7 @@ static int test_ahash_cycles(struct ahash_request *req, int blen,
 
 		start = get_cycles();
 
-		ret = crypto_ahash_init(req);
+		ret = do_one_ahash_op(req, crypto_ahash_init(req));
 		if (ret)
 			goto out;
 		for (pcount = 0; pcount < blen; pcount += plen) {