Commit 0049a132 authored by Horia Geantă's avatar Horia Geantă Committed by Herbert Xu
Browse files

crypto: caam/qi - simplify error path for context allocation 



Wang Qing reports that IS_ERR_OR_NULL() should be matched with
PTR_ERR_OR_ZERO(), not PTR_ERR().

As it turns out, the error path always returns an error code,
i.e. NULL is never returned.
Update the code accordingly - s/IS_ERR_OR_NULL/IS_ERR.

Reported-by: default avatarWang Qing <wangqing@vivo.com>
Signed-off-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3ad99c22

drivers/crypto/caam/caamalg_qi.c

+4 −4
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ static struct caam_drv_ctx *get_drv_ctx(struct caam_ctx *ctx, 


			cpu = smp_processor_id();

			drv_ctx = caam_drv_ctx_init(ctx->qidev, &cpu, desc);

			if (!IS_ERR_OR_NULL(drv_ctx))

			if (!IS_ERR(drv_ctx))

				drv_ctx->op_type = type;



			ctx->drv_ctx[type] = drv_ctx;
@@ -955,7 +955,7 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req, 
	struct caam_drv_ctx *drv_ctx;



	drv_ctx = get_drv_ctx(ctx, encrypt ? ENCRYPT : DECRYPT);

	if (IS_ERR_OR_NULL(drv_ctx))

	if (IS_ERR(drv_ctx))

		return (struct aead_edesc *)drv_ctx;



	/* allocate space for base edesc and hw desc commands, link tables */
@@ -1165,7 +1165,7 @@ static inline int aead_crypt(struct aead_request *req, bool encrypt) 


	/* allocate extended descriptor */

	edesc = aead_edesc_alloc(req, encrypt);

	if (IS_ERR_OR_NULL(edesc))

	if (IS_ERR(edesc))

		return PTR_ERR(edesc);



	/* Create and submit job descriptor */
@@ -1259,7 +1259,7 @@ static struct skcipher_edesc *skcipher_edesc_alloc(struct skcipher_request *req, 
	struct caam_drv_ctx *drv_ctx;



	drv_ctx = get_drv_ctx(ctx, encrypt ? ENCRYPT : DECRYPT);

	if (IS_ERR_OR_NULL(drv_ctx))

	if (IS_ERR(drv_ctx))

		return (struct skcipher_edesc *)drv_ctx;



	src_nents = sg_nents_for_len(req->src, req->cryptlen);