diff options
author | Wang, Rui Y <rui.y.wang@intel.com> | 2016-01-27 04:08:37 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-01-30 09:05:15 -0500 |
commit | fe09786178f9df713a4b2dd6b93c0a722346bf5e (patch) | |
tree | 9a9c372dd59104b12cf99828ed8a1ddcfb1b3c8c | |
parent | 00420a65fa2beb3206090ead86942484df2275f3 (diff) |
crypto: algif_hash - wait for crypto_ahash_init() to complete
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>
-rw-r--r-- | crypto/algif_hash.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 608a7562839d..68a5ceaa04c8 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c | |||
@@ -54,7 +54,8 @@ static int hash_sendmsg(struct socket *sock, struct msghdr *msg, | |||
54 | 54 | ||
55 | lock_sock(sk); | 55 | lock_sock(sk); |
56 | if (!ctx->more) { | 56 | if (!ctx->more) { |
57 | err = crypto_ahash_init(&ctx->req); | 57 | err = af_alg_wait_for_completion(crypto_ahash_init(&ctx->req), |
58 | &ctx->completion); | ||
58 | if (err) | 59 | if (err) |
59 | goto unlock; | 60 | goto unlock; |
60 | } | 61 | } |
@@ -125,6 +126,7 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page, | |||
125 | } else { | 126 | } else { |
126 | if (!ctx->more) { | 127 | if (!ctx->more) { |
127 | err = crypto_ahash_init(&ctx->req); | 128 | err = crypto_ahash_init(&ctx->req); |
129 | err = af_alg_wait_for_completion(err, &ctx->completion); | ||
128 | if (err) | 130 | if (err) |
129 | goto unlock; | 131 | goto unlock; |
130 | } | 132 | } |