Commit 44b45cde authored by Thara Gopinath's avatar Thara Gopinath Committed by Herbert Xu
Browse files

crypto: qce - Return error for non-blocksize data(ECB/CBC algorithms) 



ECB/CBC encryption/decryption requires the data to be blocksize aligned.
Crypto engine hangs on non-block sized operations for these algorithms.
Return invalid data if data size is not blocksize aligned for these
algorithms.

Signed-off-by: default avatarThara Gopinath <thara.gopinath@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f0878946

drivers/crypto/qce/skcipher.c

+9 −0
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ static int qce_skcipher_crypt(struct skcipher_request *req, int encrypt) 
	struct qce_cipher_ctx *ctx = crypto_skcipher_ctx(tfm);

	struct qce_cipher_reqctx *rctx = skcipher_request_ctx(req);

	struct qce_alg_template *tmpl = to_cipher_tmpl(tfm);

	unsigned int blocksize = crypto_skcipher_blocksize(tfm);

	int keylen;

	int ret;
@@ -265,6 +266,14 @@ static int qce_skcipher_crypt(struct skcipher_request *req, int encrypt) 
	if (!req->cryptlen)

		return 0;



	/*

	 * ECB and CBC algorithms require message lengths to be

	 * multiples of block size.

	 */

	if (IS_ECB(rctx->flags) || IS_CBC(rctx->flags))

		if (!IS_ALIGNED(req->cryptlen, blocksize))

			return -EINVAL;



	/* qce is hanging when AES-XTS request len > QCE_SECTOR_SIZE and

	 * is not a multiple of it; pass such requests to the fallback

	 */