| Message ID | 20210402171348.3581-1-lyl2019@mail.ustc.edu.cn |
|---|---|
| State | Accepted |
| Commit | f7cae626cabb3350b23722b78fe34dd7a615ca04 |
| Headers | show |
| Series | crypto: qat: Fix a double free in adf_create_ring | expand |
On Fri, Apr 02, 2021 at 10:13:48AM -0700, Lv Yunlong wrote: > 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: a672a9dc872ec ("crypto: qat - Intel(R) QAT transport code") > Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn> > --- > drivers/crypto/qat/qat_common/adf_transport.c | 1 + > 1 file changed, 1 insertion(+) Patch applied. Thanks. -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
diff --git a/drivers/crypto/qat/qat_common/adf_transport.c b/drivers/crypto/qat/qat_common/adf_transport.c index 888c1e047295..8ba28409fb74 100644 --- a/drivers/crypto/qat/qat_common/adf_transport.c +++ b/drivers/crypto/qat/qat_common/adf_transport.c @@ -172,6 +172,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; }
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: a672a9dc872ec ("crypto: qat - Intel(R) QAT transport code") Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn> --- drivers/crypto/qat/qat_common/adf_transport.c | 1 + 1 file changed, 1 insertion(+)