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 <[email protected]> Signed-off-by: Gilad Ben-Yossef <[email protected]> CC: [email protected] Signed-off-by: Herbert Xu <[email protected]>
opendata26 · May 23, 2017 · f3ad587 · f3ad587
1 parent a5dfefb
commit f3ad587
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/crypto/gcm.c b/crypto/gcm.c
@@ -152,10 +152,8 @@ 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)
-			err = data->result.err;
+		wait_for_completion(&data->result.completion);
+		err = data->result.err;
 	}
 
 	if (err)