Commit 297b931c authored by Andrei Botila's avatar Andrei Botila Committed by Herbert Xu
Browse files

crypto: caam - add xts check for block length equal to zero 



XTS should not return succes when dealing with block length equal to zero.
This is different than the rest of the skcipher algorithms.

Fixes: 31bb2f0d ("crypto: caam - check zero-length input")
Cc: <stable@vger.kernel.org> # v5.4+
Signed-off-by: default avatarAndrei Botila <andrei.botila@nxp.com>
Reviewed-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 596efd57

drivers/crypto/caam/caamalg.c

+6 −1
Original line number Diff line number Diff line
@@ -1787,7 +1787,12 @@ static inline int skcipher_crypt(struct skcipher_request *req, bool encrypt) 
	u32 *desc;

	int ret = 0;



	if (!req->cryptlen)

	/*

	 * XTS is expected to return an error even for input length = 0

	 * Note that the case input length < block size will be caught during

	 * HW offloading and return an error.

	 */

	if (!req->cryptlen && !ctx->fallback)

		return 0;



	if (ctx->fallback && (xts_skcipher_ivsize(req) ||

drivers/crypto/caam/caamalg_qi.c

+6 −1
Original line number Diff line number Diff line
@@ -1405,7 +1405,12 @@ static inline int skcipher_crypt(struct skcipher_request *req, bool encrypt) 
	struct caam_ctx *ctx = crypto_skcipher_ctx(skcipher);

	int ret;



	if (!req->cryptlen)

	/*

	 * XTS is expected to return an error even for input length = 0

	 * Note that the case input length < block size will be caught during

	 * HW offloading and return an error.

	 */

	if (!req->cryptlen && !ctx->fallback)

		return 0;



	if (ctx->fallback && (xts_skcipher_ivsize(req) ||

drivers/crypto/caam/caamalg_qi2.c

+12 −2
Original line number Diff line number Diff line
@@ -1472,7 +1472,12 @@ static int skcipher_encrypt(struct skcipher_request *req) 
	struct caam_request *caam_req = skcipher_request_ctx(req);

	int ret;



	if (!req->cryptlen)

	/*

	 * XTS is expected to return an error even for input length = 0

	 * Note that the case input length < block size will be caught during

	 * HW offloading and return an error.

	 */

	if (!req->cryptlen && !ctx->fallback)

		return 0;



	if (ctx->fallback && (xts_skcipher_ivsize(req) ||
@@ -1516,7 +1521,12 @@ static int skcipher_decrypt(struct skcipher_request *req) 
	struct caam_request *caam_req = skcipher_request_ctx(req);

	int ret;



	if (!req->cryptlen)

	/*

	 * XTS is expected to return an error even for input length = 0

	 * Note that the case input length < block size will be caught during

	 * HW offloading and return an error.

	 */

	if (!req->cryptlen && !ctx->fallback)

		return 0;



	if (ctx->fallback && (xts_skcipher_ivsize(req) ||

CRA Git | Maintained and supported by SUSTech CRA and CCSE