lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dma: intel_mid_dma: fix double free on mid_setup_dma error path

Browse Source 
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: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Axel Lin
2010-11-02 09:52:17 +08:00
committed by Dan Williams
parent cbeae41888
commit 51a1efe2e8
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/dma/intel_mid_dma.c
View File

@@ -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 @@ err_engine:
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;