From: Grant Grundler <grantgrundler@gmail.com>
To: Francois Romieu <romieu@fr.zoreil.com>
Cc: netdev@vger.kernel.org, David Miller <davem@davemloft.net>,
Grant Grundler <grundler@parisc-linux.org>
Subject: Re: [PATCH net-next 23/34] uli526x: fix regions leak in driver probe error path.
Date: Wed, 4 Apr 2012 12:10:47 -0700 [thread overview]
Message-ID: <CANEJEGsFOBKi2CF+wpfLA695z_uTa2O1akmBCOT5vb3WNHPJqg@mail.gmail.com> (raw)
In-Reply-To: <cc6d6ac73b8297d3eda5ef20a83a1eb0587b52e9.1331814082.git.romieu@fr.zoreil.com>
On Thu, Mar 15, 2012 at 6:57 AM, Francois Romieu <romieu@fr.zoreil.com> wrote:
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
> Cc: Grant Grundler <grundler@parisc-linux.org>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
cheers,
grant
> ---
> drivers/net/ethernet/dec/tulip/uli526x.c | 48 ++++++++++++-----------------
> 1 files changed, 20 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
> index fc4001f..c9b3396 100644
> --- a/drivers/net/ethernet/dec/tulip/uli526x.c
> +++ b/drivers/net/ethernet/dec/tulip/uli526x.c
> @@ -313,9 +313,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
> goto err_out_disable;
> }
>
> - if (pci_request_regions(pdev, DRV_NAME)) {
> + err = pci_request_regions(pdev, DRV_NAME);
> + if (err < 0) {
> pr_err("Failed to request PCI regions\n");
> - err = -ENODEV;
> goto err_out_disable;
> }
>
> @@ -323,18 +323,15 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
> db = netdev_priv(dev);
>
> /* Allocate Tx/Rx descriptor memory */
> + err = -ENOMEM;
> +
> db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
> - if(db->desc_pool_ptr == NULL)
> - {
> - err = -ENOMEM;
> - goto err_out_nomem;
> - }
> + if (!db->desc_pool_ptr)
> + goto err_out_release;
> +
> db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
> - if(db->buf_pool_ptr == NULL)
> - {
> - err = -ENOMEM;
> - goto err_out_nomem;
> - }
> + if (!db->buf_pool_ptr)
> + goto err_out_free_tx_desc;
>
> db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
> db->first_tx_desc_dma = db->desc_pool_dma_ptr;
> @@ -387,7 +384,7 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
> }
> err = register_netdev (dev);
> if (err)
> - goto err_out_res;
> + goto err_out_free_tx_buf;
>
> netdev_info(dev, "ULi M%04lx at pci%s, %pM, irq %d\n",
> ent->driver_data >> 16, pci_name(pdev),
> @@ -397,16 +394,14 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
>
> return 0;
>
> -err_out_res:
> +err_out_free_tx_buf:
> + pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
> + db->buf_pool_ptr, db->buf_pool_dma_ptr);
> +err_out_free_tx_desc:
> + pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
> + db->desc_pool_ptr, db->desc_pool_dma_ptr);
> +err_out_release:
> pci_release_regions(pdev);
> -err_out_nomem:
> - if(db->desc_pool_ptr)
> - pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
> - db->desc_pool_ptr, db->desc_pool_dma_ptr);
> -
> - if(db->buf_pool_ptr != NULL)
> - pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
> - db->buf_pool_ptr, db->buf_pool_dma_ptr);
> err_out_disable:
> pci_disable_device(pdev);
> err_out_free:
> @@ -422,19 +417,16 @@ static void __devexit uli526x_remove_one (struct pci_dev *pdev)
> struct net_device *dev = pci_get_drvdata(pdev);
> struct uli526x_board_info *db = netdev_priv(dev);
>
> - ULI526X_DBUG(0, "uli526x_remove_one()", 0);
> -
> + unregister_netdev(dev);
> pci_free_consistent(db->pdev, sizeof(struct tx_desc) *
> DESC_ALL_CNT + 0x20, db->desc_pool_ptr,
> db->desc_pool_dma_ptr);
> pci_free_consistent(db->pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
> db->buf_pool_ptr, db->buf_pool_dma_ptr);
> - unregister_netdev(dev);
> pci_release_regions(pdev);
> - free_netdev(dev); /* free board information */
> - pci_set_drvdata(pdev, NULL);
> pci_disable_device(pdev);
> - ULI526X_DBUG(0, "uli526x_remove_one() exit", 0);
> + pci_set_drvdata(pdev, NULL);
> + free_netdev(dev);
> }
>
>
> --
> 1.7.7.6
>
next prev parent reply other threads:[~2012-04-04 19:10 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-15 13:56 [PATCH net-next 00/34] Pull request for 'davem-next.base_addr.removal' branch Francois Romieu
2012-03-15 13:56 ` [PATCH net-next 01/34] sungem: stop using net_device.{base_addr, irq} Francois Romieu
2012-03-15 13:56 ` [PATCH net-next 02/34] tehuti: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 03/34] forcedeth: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 04/34] atl1c: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 05/34] via-rhine: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 06/34] hamachi: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 07/34] via-velocity: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 08/34] sundance: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 09/34] vxge: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 10/34] fealnx: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 11/34] atl1e: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 12/34] s2io: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 13/34] 8139cp: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 14/34] yellowfin: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 15/34] starfire: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 16/34] starfire: remove deprecated options Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 17/34] bnx2: stop using net_device.{base_addr, irq} Francois Romieu
2012-03-15 20:47 ` Michael Chan
2012-03-15 13:57 ` [PATCH net-next 18/34] winbond840: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 19/34] sc92031: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 20/34] sis190: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 21/34] tulip_core: " Francois Romieu
2012-04-04 14:52 ` Grant Grundler
2012-03-15 13:57 ` [PATCH net-next 22/34] sunhme: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 23/34] uli526x: fix regions leak in driver probe error path Francois Romieu
2012-04-04 19:10 ` Grant Grundler [this message]
2012-03-15 13:57 ` [PATCH net-next 24/34] xircom_cb: fix device " Francois Romieu
2012-04-04 1:10 ` Grant Grundler
2012-03-15 13:57 ` [PATCH net-next 25/34] xircom_cb: stop using net_device.{base_addr, irq} and convert to __iomem Francois Romieu
2012-04-04 1:23 ` Grant Grundler
2012-03-15 13:57 ` [PATCH net-next 26/34] de2104x: stop using net_device.{base_addr, irq} Francois Romieu
2012-04-04 1:15 ` Grant Grundler
2012-03-15 13:57 ` [PATCH net-next 27/34] smsc9420: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 28/34] natsemi: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 29/34] 8139too: dev->{base_addr, irq} removal Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 30/34] dl2k: stop using net_device.{base_addr, irq} and convert to __iomem Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 31/34] uli526x: " Francois Romieu
2012-03-18 6:33 ` Grant Grundler
2012-03-15 13:57 ` [PATCH net-next 32/34] epic100: " Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 33/34] dmfe: " Francois Romieu
2012-03-16 17:48 ` Grant Grundler
2012-03-17 11:31 ` Francois Romieu
2012-03-15 13:57 ` [PATCH net-next 34/34] sis900: " Francois Romieu
2012-03-15 22:05 ` [PATCH net-next 00/34] Pull request for 'davem-next.base_addr.removal' branch David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CANEJEGsFOBKi2CF+wpfLA695z_uTa2O1akmBCOT5vb3WNHPJqg@mail.gmail.com \
--to=grantgrundler@gmail.com \
--cc=davem@davemloft.net \
--cc=grundler@parisc-linux.org \
--cc=netdev@vger.kernel.org \
--cc=romieu@fr.zoreil.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).