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

Commit 5829cc8d authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: qat - Clean up error handling in qat_dh_set_secret() 



Update the error handling in qat_dh_set_secret() to mirror
dh_set_secret().  The new version is less error-prone because freeing
memory and setting the pointers to NULL is now only done in one place.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent ccd9888f

drivers/crypto/qat/qat_common/qat_asym_algs.c

+8 −7
Original line number Diff line number Diff line
@@ -462,11 +462,8 @@ static int qat_dh_set_params(struct qat_dh_ctx *ctx, struct dh *params) 
	}



	ctx->g = dma_zalloc_coherent(dev, ctx->p_size, &ctx->dma_g, GFP_KERNEL);

	if (!ctx->g) {

		dma_free_coherent(dev, ctx->p_size, ctx->p, ctx->dma_p);

		ctx->p = NULL;

	if (!ctx->g)

		return -ENOMEM;

	}

	memcpy(ctx->g + (ctx->p_size - params->g_size), params->g,

	       params->g_size);
@@ -507,18 +504,22 @@ static int qat_dh_set_secret(struct crypto_kpp *tfm, const void *buf, 


	ret = qat_dh_set_params(ctx, &params);

	if (ret < 0)

		return ret;

		goto err_clear_ctx;



	ctx->xa = dma_zalloc_coherent(dev, ctx->p_size, &ctx->dma_xa,

				      GFP_KERNEL);

	if (!ctx->xa) {

		qat_dh_clear_ctx(dev, ctx);

		return -ENOMEM;

		ret = -ENOMEM;

		goto err_clear_ctx;

	}

	memcpy(ctx->xa + (ctx->p_size - params.key_size), params.key,

	       params.key_size);



	return 0;



err_clear_ctx:

	qat_dh_clear_ctx(dev, ctx);

	return ret;

}



static unsigned int qat_dh_max_size(struct crypto_kpp *tfm)