Subject: RE: [PATCH V13 2/7] net: sxgbe: add basic framework for Samsung 10Gb ethernet driver

From: Byungho An <[email-masked]>
Date: Mon, 24 Mar 2014 20:08:43 -0700

Francois Romieu <[email-masked]> :
> > +static int sxgbe_platform_probe(struct platform_device *pdev)
> [...]
> > +	/* Get the SXGBE common INT information */
> > +	priv->irq  = irq_of_parse_and_map(node, 0);
> > +	if (priv->irq <= 0) {
> > +		dev_err(dev, "sxgbe common irq parsing failed\n");
> > +		irq_dispose_mapping(priv->irq);
> > +		sxgbe_drv_remove(ndev);
> 
> sxgbe_drv_probe has not been issued at this point.
I missed, sxgbe_drv_probe will be moved before that.

> 
> > +		return -EINVAL;
> > +	}
> > +
> > +	/* Get the TX/RX IRQ numbers */
> > +	for (i = 0, chan = 1; i < SXGBE_TX_QUEUES; i++) {
> > +		priv->txq[i]->irq_no = irq_of_parse_and_map(node, chan++);
> > +		if (priv->txq[i]->irq_no <= 0) {
> > +			dev_err(dev, "sxgbe tx irq parsing failed\n");
> > +			irq_dispose_mapping(priv->txq[i]->irq_no);
> 
> Releasing the failed irq_no and leaking the i - 1  succeeded ones can't be
right.
> 
> > +			sxgbe_drv_remove(ndev);
> 
> Sic.
> 
> > +			return -EINVAL;
> > +		}
> > +	}
> > +
> > +	for (i = 0; i < SXGBE_RX_QUEUES; i++) {
> > +		priv->rxq[i]->irq_no = irq_of_parse_and_map(node, chan++);
> > +		if (priv->rxq[i]->irq_no <= 0) {
> > +			dev_err(dev, "sxgbe rx irq parsing failed\n");
> > +			irq_dispose_mapping(priv->rxq[i]->irq_no);
> > +			sxgbe_drv_remove(ndev);
> 
> Same problem(s) as above + priv->txq[.]->irq_no leak.
> 
> Please use goto for the unwind path.

How about below?
[snip]

        priv = sxgbe_drv_probe(&(pdev->dev), plat_dat, addr);
        if (!priv) {
                pr_err("%s: main driver probe failed\n", __func__);
                goto err_out;
        }

        /* Get the SXGBE common INT information */
        priv->irq  = irq_of_parse_and_map(node, 0);
        if (priv->irq <= 0) {
                dev_err(dev, "sxgbe common irq parsing failed\n");
                goto err_irq_unmap;
        }

        /* Get the TX/RX IRQ numbers */
        for (i = 0, chan = 1; i < SXGBE_TX_QUEUES; i++) {
                priv->txq[i]->irq_no = irq_of_parse_and_map(node, chan++);
                if (priv->txq[i]->irq_no <= 0) {
                        dev_err(dev, "sxgbe tx irq parsing failed\n");
                        goto err_irq_unmap;
                }
        }

        for (i = 0; i < SXGBE_RX_QUEUES; i++) {
                priv->rxq[i]->irq_no = irq_of_parse_and_map(node, chan++);
                if (priv->rxq[i]->irq_no <= 0) {
                        dev_err(dev, "sxgbe rx irq parsing failed\n");
                        goto err_irq_unmap;
                }
        }

        platform_set_drvdata(pdev, priv->dev);

        pr_debug("platform driver registration completed\n");

        return 0;

err_irq_unmap:
        if (priv->irq != NO_IRQ)
                irq_dispose_mapping(priv->irq);
        if (priv->txq[i - 1]->irq_no != NO_IRQ)
                irq_dispose_mapping(priv->txq[i - 1]->irq_no);
        if (priv->rxq[i - 1]->irq_no != NO_IRQ)
                irq_dispose_mapping(priv->rxq[i - 1]->irq_no);
err_out:
        sxgbe_drv_remove(ndev);
        return -ENODEV
[snip]

> 
> > +			return -EINVAL;
> > +		}
> > +	}
> > +
> > +	priv = sxgbe_drv_probe(&(pdev->dev), plat_dat, addr);
> > +	if (!priv) {
> > +		pr_err("%s: main driver probe failed\n", __func__);
> > +		return -ENODEV;
> 
> The error path is wrong.
> 
> --
> Ueimor