diff options
| author | Wang, Rui Y <rui.y.wang@intel.com> | 2016-01-27 17:08:37 +0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-02-15 15:45:29 -0500 |
| commit | bd92b10c95b37a4d6c043ad76d51d13dee45c477 (patch) | |
| tree | 64b3e761ee6390f55c6bfeb637d9c400ffd246e7 /crypto | |
| parent | caec5c97583b7ea44c57be91a19d28b0ac447fe4 (diff) | |
| download | linux-exynos-bd92b10c95b37a4d6c043ad76d51d13dee45c477.tar.gz linux-exynos-bd92b10c95b37a4d6c043ad76d51d13dee45c477.tar.bz2 linux-exynos-bd92b10c95b37a4d6c043ad76d51d13dee45c477.zip | |
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.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 7b5018b34c97..d7a3435280d8 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, 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; } @@ -125,6 +126,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; } |