Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 13:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

sata_dwc_460ex: fix error path

Browse Source 
Fixed hsdev memleak on sata_dwc_probe() error.
As dma_dwc_exit() can be called multiple times without sata_dma_regs and
irq_dma changes, it might lead to double free on sequential
dma_dwc_exit() calls.  So, zero these fields after free calls.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Vasiliy Kulikov 2011-07-03 15:26:47 +04:00 committed by Jeff Garzik
parent 3c4aa91f21
commit 04e506b5e7
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/ata/sata_dwc_460ex.c
View File

@ -766,11 +766,15 @@ static int dma_dwc_xfer_setup(struct scatterlist *sg, int num_elems,
static void dma_dwc_exit(struct sata_dwc_device *hsdev) static void dma_dwc_exit(struct sata_dwc_device *hsdev)
{ {
dev_dbg(host_pvt.dwc_dev, "%s:\n", __func__); dev_dbg(host_pvt.dwc_dev, "%s:\n", __func__);
if (host_pvt.sata_dma_regs) if (host_pvt.sata_dma_regs) {
iounmap(host_pvt.sata_dma_regs); iounmap(host_pvt.sata_dma_regs);
host_pvt.sata_dma_regs = NULL;
}
if (hsdev->irq_dma) if (hsdev->irq_dma) {
free_irq(hsdev->irq_dma, hsdev); free_irq(hsdev->irq_dma, hsdev);
hsdev->irq_dma = 0;
}
} }
/* /*
@ -1642,7 +1646,7 @@ static int sata_dwc_probe(struct platform_device *ofdev)
if (hsdev == NULL) { if (hsdev == NULL) {
dev_err(&ofdev->dev, "kmalloc failed for hsdev\n"); dev_err(&ofdev->dev, "kmalloc failed for hsdev\n");
err = -ENOMEM; err = -ENOMEM;
goto error_out; goto error;
} }
memset(hsdev, 0, sizeof(*hsdev)); memset(hsdev, 0, sizeof(*hsdev));
@ -1652,7 +1656,7 @@ static int sata_dwc_probe(struct platform_device *ofdev)
dev_err(&ofdev->dev, "ioremap failed for SATA register" dev_err(&ofdev->dev, "ioremap failed for SATA register"
" address\n"); " address\n");
err = -ENODEV; err = -ENODEV;
goto error_out; goto error_kmalloc;
} }
hsdev->reg_base = base; hsdev->reg_base = base;
dev_dbg(&ofdev->dev, "ioremap done for SATA register address\n"); dev_dbg(&ofdev->dev, "ioremap done for SATA register address\n");
@ -1665,7 +1669,7 @@ static int sata_dwc_probe(struct platform_device *ofdev)
if (!host) { if (!host) {
dev_err(&ofdev->dev, "ata_host_alloc_pinfo failed\n"); dev_err(&ofdev->dev, "ata_host_alloc_pinfo failed\n");
err = -ENOMEM; err = -ENOMEM;
goto error_out; goto error_iomap;
} }
host->private_data = hsdev; host->private_data = hsdev;
@ -1733,8 +1737,11 @@ error_out:
/* Free SATA DMA resources */ /* Free SATA DMA resources */
dma_dwc_exit(hsdev); dma_dwc_exit(hsdev);
if (base) error_iomap:
iounmap(base); iounmap(base);
error_kmalloc:
kfree(hsdev);
error:
return err; return err;
} }