Commit 2b5ac174 authored Jan 15, 2019 by Gilad Ben-Yossef Committed by Herbert Xu Jan 25, 2019

crypto: ccree - don't copy zero size ciphertext



For decryption in CBC mode we need to save the last ciphertext block
for use as the next IV. However, we were trying to do this also with
zero sized ciphertext resulting in a panic.

Fix this by only doing the copy if the ciphertext length is at least
of IV size.

Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Cc: stable@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent 27649c39

drivers/crypto/ccree/cc_cipher.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -800,7 +800,8 @@ static int cc_cipher_decrypt(struct skcipher_request *req)

		memset(req_ctx, 0, sizeof(*req_ctx));

		if (ctx_p->cipher_mode == DRV_CIPHER_CBC) {
		if ((ctx_p->cipher_mode == DRV_CIPHER_CBC) &&
		(req->cryptlen >= ivsize)) {

		/* Allocate and save the last IV sized bytes of the source,
		* which will be lost in case of in-place decryption.

Admin message