| Message ID | 5439252.0G82yiBcdS@amdc1032 |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
On 03/31/2014 10:53 AM, Bartlomiej Zolnierkiewicz wrote: > Add missing kfree() call to ata_host_activate() failure path. > Are you seeing failures in real systems, or is this just a change to fix a theoretical memory leak? > Cc: Ralf Baechle <ralf@linux-mips.org> > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Did you test the patch on real hardware? If so, you can add: Acked-By: David Daney <david.daney@cavium.com> Otherwise, somebody will have to go and test it. Thanks, David Daney > --- > drivers/ata/pata_octeon_cf.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > Index: b/drivers/ata/pata_octeon_cf.c > =================================================================== > --- a/drivers/ata/pata_octeon_cf.c 2014-03-14 16:45:04.320724377 +0100 > +++ b/drivers/ata/pata_octeon_cf.c 2014-03-31 18:58:44.367604046 +0200 > @@ -1020,13 +1020,16 @@ static int octeon_cf_probe(struct platfo > > ata_port_desc(ap, "cmd %p ctl %p", base, ap->ioaddr.ctl_addr); > > - > dev_info(&pdev->dev, "version " DRV_VERSION" %d bit%s.\n", > is_16bit ? 16 : 8, > cf_port->is_true_ide ? ", True IDE" : ""); > > - return ata_host_activate(host, irq, irq_handler, > - IRQF_SHARED, &octeon_cf_sht); > + rv = ata_host_activate(host, irq, irq_handler, > + IRQF_SHARED, &octeon_cf_sht); > + if (rv) > + goto free_cf_port; > + > + return 0; > > free_cf_port: > kfree(cf_port); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > > -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 03/31/2014 10:53 AM, Bartlomiej Zolnierkiewicz wrote: > Add missing kfree() call to ata_host_activate() failure path. > > Cc: Ralf Baechle <ralf@linux-mips.org> > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > --- > drivers/ata/pata_octeon_cf.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > Index: b/drivers/ata/pata_octeon_cf.c > =================================================================== > --- a/drivers/ata/pata_octeon_cf.c 2014-03-14 16:45:04.320724377 +0100 > +++ b/drivers/ata/pata_octeon_cf.c 2014-03-31 18:58:44.367604046 +0200 > @@ -1020,13 +1020,16 @@ static int octeon_cf_probe(struct platfo > > ata_port_desc(ap, "cmd %p ctl %p", base, ap->ioaddr.ctl_addr); > > - > dev_info(&pdev->dev, "version " DRV_VERSION" %d bit%s.\n", > is_16bit ? 16 : 8, > cf_port->is_true_ide ? ", True IDE" : ""); > > - return ata_host_activate(host, irq, irq_handler, > - IRQF_SHARED, &octeon_cf_sht); > + rv = ata_host_activate(host, irq, irq_handler, > + IRQF_SHARED, &octeon_cf_sht); > + if (rv) > + goto free_cf_port; > + Just a few lines above: rv = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); if (rv) return rv; So you don't really completely fix the leak, it be theoretic or not. It might be better (and actually simplify the code) to use devm_kzalloc(). Guenter > + return 0; > > free_cf_port: > kfree(cf_port); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > > > > -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: b/drivers/ata/pata_octeon_cf.c =================================================================== --- a/drivers/ata/pata_octeon_cf.c 2014-03-14 16:45:04.320724377 +0100 +++ b/drivers/ata/pata_octeon_cf.c 2014-03-31 18:58:44.367604046 +0200 @@ -1020,13 +1020,16 @@ static int octeon_cf_probe(struct platfo ata_port_desc(ap, "cmd %p ctl %p", base, ap->ioaddr.ctl_addr); - dev_info(&pdev->dev, "version " DRV_VERSION" %d bit%s.\n", is_16bit ? 16 : 8, cf_port->is_true_ide ? ", True IDE" : ""); - return ata_host_activate(host, irq, irq_handler, - IRQF_SHARED, &octeon_cf_sht); + rv = ata_host_activate(host, irq, irq_handler, + IRQF_SHARED, &octeon_cf_sht); + if (rv) + goto free_cf_port; + + return 0; free_cf_port: kfree(cf_port);
Add missing kfree() call to ata_host_activate() failure path. Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> --- drivers/ata/pata_octeon_cf.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html