diff options
author | Gilad Ben-Yossef <gilad@benyossef.com> | 2017-05-18 09:29:24 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-05-23 00:45:11 -0400 |
commit | a5dfefb1c3f3db81662556393fd9283511e08430 (patch) | |
tree | 34d6e7ae619ec2d574edb548bce8831b22f8c247 /crypto | |
parent | e68368aed56324e2e38d4f6b044bb8cf82077fc2 (diff) |
crypto: drbg - wait for crypto op not signal safe
drbg_kcapi_sym_ctr() was using wait_for_completion_interruptible() to
wait for completion of async crypto op but if a signal occurs it
may return before DMA ops of HW crypto provider finish, thus
corrupting the output buffer.
Resolve this by using wait_for_completion() instead.
Reported-by: Eric Biggers <ebiggers3@gmail.com>
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
CC: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/drbg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/drbg.c b/crypto/drbg.c index fa749f470135..cdb27ac4b226 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c | |||
@@ -1767,9 +1767,8 @@ static int drbg_kcapi_sym_ctr(struct drbg_state *drbg, | |||
1767 | break; | 1767 | break; |
1768 | case -EINPROGRESS: | 1768 | case -EINPROGRESS: |
1769 | case -EBUSY: | 1769 | case -EBUSY: |
1770 | ret = wait_for_completion_interruptible( | 1770 | wait_for_completion(&drbg->ctr_completion); |
1771 | &drbg->ctr_completion); | 1771 | if (!drbg->ctr_async_err) { |
1772 | if (!ret && !drbg->ctr_async_err) { | ||
1773 | reinit_completion(&drbg->ctr_completion); | 1772 | reinit_completion(&drbg->ctr_completion); |
1774 | break; | 1773 | break; |
1775 | } | 1774 | } |