Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94f9453d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: crypto: Fix integer over flow check in qcrypto driver"

parents 76b4102c 919df5e1

drivers/crypto/msm/qcrypto.c

+3 −3
Original line number Diff line number Diff line
@@ -2261,12 +2261,12 @@ static int _qcrypto_process_aead(struct crypto_engine *pengine, 
			 * include  assoicated data, ciphering data stream,

			 * generated MAC, and CCM padding.

			 */

			if ((MAX_ALIGN_SIZE * 2 > ULONG_MAX - req->assoclen) ||

			if ((MAX_ALIGN_SIZE * 2 > UINT_MAX - req->assoclen) ||

				((MAX_ALIGN_SIZE * 2 + req->assoclen) >

						ULONG_MAX - qreq.ivsize) ||

						UINT_MAX - qreq.ivsize) ||

				((MAX_ALIGN_SIZE * 2 + req->assoclen

					+ qreq.ivsize)

						> ULONG_MAX - req->cryptlen)) {

						> UINT_MAX - req->cryptlen)) {

				pr_err("Integer overflow on aead req length.\n");

				return -EINVAL;

			}