From: Tudor Ambarus <tudor.ambarus@microchip.com>
Date: Tue, 20 Jul 2021 08:55:30 +0000 (+0300)
Subject: crypto: atmel-aes - Add XTS input length constraint
X-Git-Tag: libata-5.15-2021-09-05~102^2~70
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=26d769ae90907e6f4724b800ba16f11681079f23;p=linux-block.git

crypto: atmel-aes - Add XTS input length constraint

Input length smaller than block size does not make sense for XTS.

Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c
index 9c6d80d1d7a0..4e9515e8dd25 100644
--- a/drivers/crypto/atmel-aes.c
+++ b/drivers/crypto/atmel-aes.c
@@ -1091,6 +1091,9 @@ static int atmel_aes_crypt(struct skcipher_request *req, unsigned long mode)
 	struct atmel_aes_dev *dd;
 	u32 opmode = mode & AES_FLAGS_OPMODE_MASK;
 
+	if (opmode == AES_FLAGS_XTS && req->cryptlen < XTS_BLOCK_SIZE)
+		return -EINVAL;
+
 	if ((opmode == AES_FLAGS_ECB || opmode == AES_FLAGS_CBC) &&
 	    !IS_ALIGNED(req->cryptlen, crypto_skcipher_blocksize(skcipher)))
 		return -EINVAL;