| Message ID | 20191213144529.9613-1-tudor.ambarus@microchip.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 3907ccfaec5d9965e306729936fc732c94d2c1e7 |
| Headers | show |
| Series | crypto: atmel-aes - Fix CTR counter overflow when multiple fragments | expand |
On Fri, Dec 13, 2019 at 02:45:44PM +0000, Tudor.Ambarus@microchip.com wrote: > From: Tudor Ambarus <tudor.ambarus@microchip.com> > > The CTR transfer works in fragments of data of maximum 1 MByte because > of the 16 bit CTR counter embedded in the IP. Fix the CTR counter > overflow handling for messages larger than 1 MByte. > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Fixes: 781a08d9740a ("crypto: atmel-aes - Fix counter overflow in CTR mode") > Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com> > --- > Thanks, Dan. > > drivers/crypto/atmel-aes.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) Patch applied. Thanks.
diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c index 245d45f93b61..b001fdcd9d95 100644 --- a/drivers/crypto/atmel-aes.c +++ b/drivers/crypto/atmel-aes.c @@ -120,7 +120,7 @@ struct atmel_aes_ctr_ctx { size_t offset; struct scatterlist src[2]; struct scatterlist dst[2]; - u16 blocks; + u32 blocks; }; struct atmel_aes_gcm_ctx { @@ -527,6 +527,12 @@ static void atmel_aes_ctr_update_req_iv(struct atmel_aes_dev *dd) unsigned int ivsize = crypto_skcipher_ivsize(skcipher); int i; + /* + * The CTR transfer works in fragments of data of maximum 1 MByte + * because of the 16 bit CTR counter embedded in the IP. When reaching + * here, ctx->blocks contains the number of blocks of the last fragment + * processed, there is no need to explicit cast it to u16. + */ for (i = 0; i < ctx->blocks; i++) crypto_inc((u8 *)ctx->iv, AES_BLOCK_SIZE);