Commit f3ad5870 authored May 18, 2017 by Gilad Ben-Yossef Committed by Herbert Xu May 23, 2017

crypto: gcm - wait for crypto op not signal safe



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>

parent a5dfefb1

crypto/gcm.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -152,9 +152,7 @@ static int crypto_gcm_setkey(struct crypto_aead aead, const u8 key,

		err = crypto_skcipher_encrypt(&data->req);
		if (err == -EINPROGRESS \|\| err == -EBUSY) {
		err = wait_for_completion_interruptible(
		&data->result.completion);
		if (!err)
		wait_for_completion(&data->result.completion);
		err = data->result.err;
		}

Admin message