aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorWang, Rui Y <rui.y.wang@intel.com>2016-01-27 17:08:37 +0800
committerSasha Levin <sasha.levin@oracle.com>2016-02-15 15:42:36 -0500
commitb7f7e957324e764ab5e50c7e988d070a44b59d65 (patch)
tree9a3c900c0f4b3219377b5943ae612f9ec17750ab /crypto
parente3c2fdba55272723d250b4ac9318dc0e1fff4c73 (diff)
downloadlinux-linaro-stable-b7f7e957324e764ab5e50c7e988d070a44b59d65.tar.gz
crypto: algif_hash - wait for crypto_ahash_init() to complete
[ Upstream commit fe09786178f9df713a4b2dd6b93c0a722346bf5e ] hash_sendmsg/sendpage() need to wait for the completion of crypto_ahash_init() otherwise it can cause panic. Cc: stable@vger.kernel.org Signed-off-by: Rui Wang <rui.y.wang@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algif_hash.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c
index c92b7f67f377..434af81b9e33 100644
--- a/crypto/algif_hash.c
+++ b/crypto/algif_hash.c
@@ -56,7 +56,8 @@ static int hash_sendmsg(struct kiocb *unused, struct socket *sock,
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 socket *sock, struct page *page,
} else {
if (!ctx->more) {
err = crypto_ahash_init(&ctx->req);
+ err = af_alg_wait_for_completion(err, &ctx->completion);
if (err)
goto unlock;
}