提交 51a1efe2 编写于 作者: A Axel Lin 提交者: Dan Williams

dma: intel_mid_dma: fix double free on mid_setup_dma error path

We should not call kfree(dma) in mid_setup_dma error path because
the memory is allocated in intel_mid_dma_probe and will be freed
in intel_mid_dma_probe error path if mid_setup_dma return error.
Signed-off-by: NAxel Lin <axel.lin@gmail.com>
Signed-off-by: NDan Williams <dan.j.williams@intel.com>
上级 cbeae418
...@@ -1075,7 +1075,6 @@ static int mid_setup_dma(struct pci_dev *pdev) ...@@ -1075,7 +1075,6 @@ static int mid_setup_dma(struct pci_dev *pdev)
if (NULL == dma->dma_pool) { if (NULL == dma->dma_pool) {
pr_err("ERR_MDMA:pci_pool_create failed\n"); pr_err("ERR_MDMA:pci_pool_create failed\n");
err = -ENOMEM; err = -ENOMEM;
kfree(dma);
goto err_dma_pool; goto err_dma_pool;
} }
...@@ -1186,7 +1185,6 @@ static int mid_setup_dma(struct pci_dev *pdev) ...@@ -1186,7 +1185,6 @@ static int mid_setup_dma(struct pci_dev *pdev)
free_irq(pdev->irq, dma); free_irq(pdev->irq, dma);
err_irq: err_irq:
pci_pool_destroy(dma->dma_pool); pci_pool_destroy(dma->dma_pool);
kfree(dma);
err_dma_pool: err_dma_pool:
pr_err("ERR_MDMA:setup_dma failed: %d\n", err); pr_err("ERR_MDMA:setup_dma failed: %d\n", err);
return err; return err;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册