Skip to content

Commit f386dc6

Browse files
Yang Shenherbertx
authored andcommitted
crypto: hisilicon - fix missed error branch
If an error occurs in the process after the SGL is mapped successfully, it need to unmap the SGL. Otherwise, memory problems may occur. Signed-off-by: Yang Shen <shenyang39@huawei.com> Signed-off-by: Chenghai Huang <huangchenghai2@huawei.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 3401f63 commit f386dc6

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

  • drivers/crypto/hisilicon

drivers/crypto/hisilicon/sgl.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ hisi_acc_sg_buf_map_to_hw_sgl(struct device *dev,
225225
dma_addr_t curr_sgl_dma = 0;
226226
struct acc_hw_sge *curr_hw_sge;
227227
struct scatterlist *sg;
228-
int sg_n;
228+
int sg_n, ret;
229229

230230
if (!dev || !sgl || !pool || !hw_sgl_dma || index >= pool->count)
231231
return ERR_PTR(-EINVAL);
@@ -240,14 +240,15 @@ hisi_acc_sg_buf_map_to_hw_sgl(struct device *dev,
240240

241241
if (sg_n_mapped > pool->sge_nr) {
242242
dev_err(dev, "the number of entries in input scatterlist is bigger than SGL pool setting.\n");
243-
return ERR_PTR(-EINVAL);
243+
ret = -EINVAL;
244+
goto err_unmap;
244245
}
245246

246247
curr_hw_sgl = acc_get_sgl(pool, index, &curr_sgl_dma);
247248
if (IS_ERR(curr_hw_sgl)) {
248249
dev_err(dev, "Get SGL error!\n");
249-
dma_unmap_sg(dev, sgl, sg_n, DMA_BIDIRECTIONAL);
250-
return ERR_PTR(-ENOMEM);
250+
ret = -ENOMEM;
251+
goto err_unmap;
251252
}
252253
curr_hw_sgl->entry_length_in_sgl = cpu_to_le16(pool->sge_nr);
253254
curr_hw_sge = curr_hw_sgl->sge_entries;
@@ -262,6 +263,11 @@ hisi_acc_sg_buf_map_to_hw_sgl(struct device *dev,
262263
*hw_sgl_dma = curr_sgl_dma;
263264

264265
return curr_hw_sgl;
266+
267+
err_unmap:
268+
dma_unmap_sg(dev, sgl, sg_n, DMA_BIDIRECTIONAL);
269+
270+
return ERR_PTR(ret);
265271
}
266272
EXPORT_SYMBOL_GPL(hisi_acc_sg_buf_map_to_hw_sgl);
267273

0 commit comments

Comments
 (0)