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

Commit 26d52ea3 authored by Tadeusz Struk's avatar Tadeusz Struk Committed by Herbert Xu
Browse files

crypto: qat - fix leak on error path 



Fix a leak on error path in qat asym

Reported-by: default avatarSalvatore Benedetto <salvatore.benedetto@intel.com>
Signed-off-by: default avatarTadeusz Struk <tadeusz.struk@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 28856a9e

drivers/crypto/qat/qat_common/qat_asym_algs.c

+36 −34
Original line number Diff line number Diff line
@@ -340,13 +340,15 @@ static int qat_rsa_enc(struct akcipher_request *req) 


	if (!ret)

		return -EINPROGRESS;

unmap_src:

	if (qat_req->src_align)

		dma_free_coherent(dev, ctx->key_sz, qat_req->src_align,

				  qat_req->in.enc.m);

	else

		if (!dma_mapping_error(dev, qat_req->in.enc.m))

			dma_unmap_single(dev, qat_req->in.enc.m, ctx->key_sz,



	if (!dma_mapping_error(dev, qat_req->phy_out))

		dma_unmap_single(dev, qat_req->phy_out,

				 sizeof(struct qat_rsa_output_params),

				 DMA_TO_DEVICE);

unmap_in_params:

	if (!dma_mapping_error(dev, qat_req->phy_in))

		dma_unmap_single(dev, qat_req->phy_in,

				 sizeof(struct qat_rsa_input_params),

				 DMA_TO_DEVICE);

unmap_dst:

	if (qat_req->dst_align)
@@ -356,14 +358,13 @@ static int qat_rsa_enc(struct akcipher_request *req) 
		if (!dma_mapping_error(dev, qat_req->out.enc.c))

			dma_unmap_single(dev, qat_req->out.enc.c, ctx->key_sz,

					 DMA_FROM_DEVICE);

unmap_in_params:

	if (!dma_mapping_error(dev, qat_req->phy_in))

		dma_unmap_single(dev, qat_req->phy_in,

				 sizeof(struct qat_rsa_input_params),

				 DMA_TO_DEVICE);

	if (!dma_mapping_error(dev, qat_req->phy_out))

		dma_unmap_single(dev, qat_req->phy_out,

				 sizeof(struct qat_rsa_output_params),

unmap_src:

	if (qat_req->src_align)

		dma_free_coherent(dev, ctx->key_sz, qat_req->src_align,

				  qat_req->in.enc.m);

	else

		if (!dma_mapping_error(dev, qat_req->in.enc.m))

			dma_unmap_single(dev, qat_req->in.enc.m, ctx->key_sz,

					 DMA_TO_DEVICE);

	return ret;

}
@@ -472,13 +473,15 @@ static int qat_rsa_dec(struct akcipher_request *req) 


	if (!ret)

		return -EINPROGRESS;

unmap_src:

	if (qat_req->src_align)

		dma_free_coherent(dev, ctx->key_sz, qat_req->src_align,

				  qat_req->in.dec.c);

	else

		if (!dma_mapping_error(dev, qat_req->in.dec.c))

			dma_unmap_single(dev, qat_req->in.dec.c, ctx->key_sz,



	if (!dma_mapping_error(dev, qat_req->phy_out))

		dma_unmap_single(dev, qat_req->phy_out,

				 sizeof(struct qat_rsa_output_params),

				 DMA_TO_DEVICE);

unmap_in_params:

	if (!dma_mapping_error(dev, qat_req->phy_in))

		dma_unmap_single(dev, qat_req->phy_in,

				 sizeof(struct qat_rsa_input_params),

				 DMA_TO_DEVICE);

unmap_dst:

	if (qat_req->dst_align)
@@ -488,14 +491,13 @@ static int qat_rsa_dec(struct akcipher_request *req) 
		if (!dma_mapping_error(dev, qat_req->out.dec.m))

			dma_unmap_single(dev, qat_req->out.dec.m, ctx->key_sz,

					 DMA_FROM_DEVICE);

unmap_in_params:

	if (!dma_mapping_error(dev, qat_req->phy_in))

		dma_unmap_single(dev, qat_req->phy_in,

				 sizeof(struct qat_rsa_input_params),

				 DMA_TO_DEVICE);

	if (!dma_mapping_error(dev, qat_req->phy_out))

		dma_unmap_single(dev, qat_req->phy_out,

				 sizeof(struct qat_rsa_output_params),

unmap_src:

	if (qat_req->src_align)

		dma_free_coherent(dev, ctx->key_sz, qat_req->src_align,

				  qat_req->in.dec.c);

	else

		if (!dma_mapping_error(dev, qat_req->in.dec.c))

			dma_unmap_single(dev, qat_req->in.dec.c, ctx->key_sz,

					 DMA_TO_DEVICE);

	return ret;

}