diff options
| author | Gilad Ben-Yossef <gilad@benyossef.com> | 2017-05-18 16:29:25 +0300 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-06-25 22:02:18 -0400 |
| commit | 026ed759f4f4f30326e4c5edf76c9fe73bde3994 (patch) | |
| tree | 887b2c1293fe6311544e251a61330b467df4fd0e /crypto | |
| parent | e02ed52dd2d34fdf369ea45caffb78ca24ee8625 (diff) | |
crypto: gcm - wait for crypto op not signal safe
[ Upstream commit f3ad587070d6bd961ab942b3fd7a85d00dfc934b ]
crypto_gcm_setkey() 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 data buffer that is kfree'ed in this case.
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/gcm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c index ee3c29bd7ddb..59b6ffe6c81b 100644 --- a/crypto/gcm.c +++ b/crypto/gcm.c @@ -146,10 +146,8 @@ static int crypto_gcm_setkey(struct crypto_aead *aead, const u8 *key, err = crypto_ablkcipher_encrypt(&data->req); if (err == -EINPROGRESS || err == -EBUSY) { - err = wait_for_completion_interruptible( - &data->result.completion); - if (!err) - err = data->result.err; + wait_for_completion(&data->result.completion); + err = data->result.err; } if (err) |