[PATCH 3.2 29/67] crypto: algif_hash - wait for crypto_ahash_init() to complete

From	Ben Hutchings <ben@decadent.org.uk>
Newsgroups	linux.kernel
Subject	[PATCH 3.2 29/67] crypto: algif_hash - wait for crypto_ahash_init() to complete
Date	2016-02-23 23:00 +0100
Message-ID	<r5t9T-2Zj-9@gated-at.bofh.it> (permalink)
References	<r5t0e-2Ub-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

3.2.78-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: "Wang, Rui Y" <rui.y.wang@intel.com>

commit fe09786178f9df713a4b2dd6b93c0a722346bf5e upstream.

hash_sendmsg/sendpage() need to wait for the completion
of crypto_ahash_init() otherwise it can cause panic.

Signed-off-by: Rui Wang <rui.y.wang@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 crypto/algif_hash.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -56,7 +56,8 @@ static int hash_sendmsg(struct kiocb *un
 
 	lock_sock(sk);
 	if (!ctx->more) {
-		err = crypto_ahash_init(&ctx->req);
+		err = af_alg_wait_for_completion(crypto_ahash_init(&ctx->req),
+						&ctx->completion);
 		if (err)
 			goto unlock;
 	}
@@ -136,6 +137,7 @@ static ssize_t hash_sendpage(struct sock
 	} else {
 		if (!ctx->more) {
 			err = crypto_ahash_init(&ctx->req);
+			err = af_alg_wait_for_completion(err, &ctx->completion);
 			if (err)
 				goto unlock;
 		}

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.2 29/67] crypto: algif_hash - wait for crypto_ahash_init()  to complete Ben Hutchings <ben@decadent.org.uk> - 2016-02-23 23:00 +0100

csiph-web