Merge "crypto: msm: check potential integer overflow" (e4ef1279) · Commits · e / devices / android_kernel_sony_msm8994

drivers/crypto/msm/qcrypto.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1881,12 +1881,12 @@ static int _qcrypto_process_aead(struct crypto_engine *pengine,
		rctx->orig_src = req->src;
		rctx->orig_dst = req->dst;

		if ((MAX_ALIGN_SIZE*2 > ULONG_MAX - req->assoclen) \|\|
		((MAX_ALIGN_SIZE*2 + req->assoclen) >
		ULONG_MAX - qreq.authsize) \|\|
		((MAX_ALIGN_SIZE*2 + req->assoclen +
		if ((MAX_ALIGN_SIZE*2 > UINT_MAX - qreq.assoclen) \|\|
		((MAX_ALIGN_SIZE*2 + qreq.assoclen) >
		UINT_MAX - qreq.authsize) \|\|
		((MAX_ALIGN_SIZE*2 + qreq.assoclen +
		qreq.authsize) >
		ULONG_MAX - req->cryptlen)) {
		UINT_MAX - req->cryptlen)) {
		pr_err("Integer overflow on aead req length.\n");
		return -EINVAL;
		}