Commit 2fbe4829 authored by Ryan Wanner's avatar Ryan Wanner Committed by Herbert Xu
Browse files

crypto: atmel-aes - Detecting in-place operations two sg lists 



Avoiding detecting finely in-place operations with different
scatter lists. Copying the source data for decryption into rctx->lastc
regardless if the operation is in-place or not. This allows in-place
operations with different scatter lists.

This approach takes less resources than parsing both scatter lists to
check if they are equal.

Signed-off-by: default avatarRyan Wanner <Ryan.Wanner@microchip.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent c13357fd

drivers/crypto/atmel-aes.c

+4 −10
Original line number Diff line number Diff line
@@ -493,17 +493,11 @@ static void atmel_aes_set_iv_as_last_ciphertext_block(struct atmel_aes_dev *dd) 
	if (req->cryptlen < ivsize)

		return;



	if (rctx->mode & AES_FLAGS_ENCRYPT) {

	if (rctx->mode & AES_FLAGS_ENCRYPT)

		scatterwalk_map_and_copy(req->iv, req->dst,

					 req->cryptlen - ivsize, ivsize, 0);

	} else {

		if (req->src == req->dst)

			memcpy(req->iv, rctx->lastc, ivsize);

	else

			scatterwalk_map_and_copy(req->iv, req->src,

						 req->cryptlen - ivsize,

						 ivsize, 0);

	}

		memcpy(req->iv, rctx->lastc, ivsize);

}



static inline struct atmel_aes_ctr_ctx *
@@ -1146,7 +1140,7 @@ static int atmel_aes_crypt(struct skcipher_request *req, unsigned long mode) 
	rctx->mode = mode;



	if (opmode != AES_FLAGS_ECB &&

	    !(mode & AES_FLAGS_ENCRYPT) && req->src == req->dst) {

	    !(mode & AES_FLAGS_ENCRYPT)) {

		unsigned int ivsize = crypto_skcipher_ivsize(skcipher);



		if (req->cryptlen >= ivsize)