Commit 8cbd176b authored Apr 02, 2021 by Lv Yunlong Committed by Greg Kroah-Hartman May 22, 2021

crypto: qat - Fix a double free in adf_create_ring



[ Upstream commit f7cae626cabb3350b23722b78fe34dd7a615ca04 ]

In adf_create_ring, if the callee adf_init_ring() failed, the callee will
free the ring->base_addr by dma_free_coherent() and return -EFAULT. Then
adf_create_ring will goto err and the ring->base_addr will be freed again
in adf_cleanup_ring().

My patch sets ring->base_addr to NULL after the first freed to avoid the
double free.

Fixes: a672a9dc ("crypto: qat - Intel(R) QAT transport code")
Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 1e564467

drivers/crypto/qat/qat_common/adf_transport.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -198,6 +198,7 @@ static int adf_init_ring(struct adf_etr_ring_data *ring)
		dev_err(&GET_DEV(accel_dev), "Ring address not aligned\n");
		dma_free_coherent(&GET_DEV(accel_dev), ring_size_bytes,
		ring->base_addr, ring->dma_addr);
		ring->base_addr = NULL;
		return -EFAULT;
		}