| Message ID | 20220813103452.26295-1-shenyang39@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | crypto: hisilicon/qm - fix missing destroy qp_idr | expand |
On Sat, Aug 13, 2022 at 06:34:52PM +0800, Yang Shen wrote: > From: Weili Qian <qianweili@huawei.com> > > In the function hisi_qm_memory_init(), if resource alloc fails after > idr_init, the initialized qp_idr needs to be destroyed. > > Signed-off-by: Weili Qian <qianweili@huawei.com> > Signed-off-by: Yang Shen <shenyang39@huawei.com> > --- > drivers/crypto/hisilicon/qm.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Patch applied. Thanks.
diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index a519ddad0af5..aaabea3c2935 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -6283,8 +6283,8 @@ static int hisi_qm_memory_init(struct hisi_qm *qm) GFP_ATOMIC); dev_dbg(dev, "allocate qm dma buf size=%zx)\n", qm->qdma.size); if (!qm->qdma.va) { - ret = -ENOMEM; - goto err_alloc_qdma; + ret = -ENOMEM; + goto err_destroy_idr; } QM_INIT_BUF(qm, eqe, QM_EQ_DEPTH); @@ -6300,7 +6300,8 @@ static int hisi_qm_memory_init(struct hisi_qm *qm) err_alloc_qp_array: dma_free_coherent(dev, qm->qdma.size, qm->qdma.va, qm->qdma.dma); -err_alloc_qdma: +err_destroy_idr: + idr_destroy(&qm->qp_idr); kfree(qm->factor); return ret;