Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933558Ab2BBX0z (ORCPT ); Thu, 2 Feb 2012 18:26:55 -0500 Received: from mail-tul01m020-f174.google.com ([209.85.214.174]:51221 "EHLO mail-tul01m020-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933430Ab2BBX0v (ORCPT ); Thu, 2 Feb 2012 18:26:51 -0500 Message-ID: <4F2B1BB7.6020608@lwfinger.net> Date: Thu, 02 Feb 2012 17:26:47 -0600 From: Larry Finger User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:9.0) Gecko/20111220 Thunderbird/9.0 MIME-Version: 1.0 To: Tim Gardner CC: Chaoming Li , "John W. Linville" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] rtlwifi: Fix PCI probe error path orphaned memory References: <1328215686-126550-1-git-send-email-tim.gardner@canonical.com> In-Reply-To: <1328215686-126550-1-git-send-email-tim.gardner@canonical.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3453 Lines: 111 On 02/02/2012 02:48 PM, Tim Gardner wrote: > Memory allocated by ieee80211_alloc_hw() will get orphaned > if any subsequent initializations fail. > > Also don't pci_set_drvdata(pdev, NULL) until just before disabling > the PCI device. Functions called by rtl_deinit_core(hw) may eventually need > the context (when its actually implemented). > > Cc: Larry Finger > Cc: Chaoming Li > Cc: John W. Linville > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Tim Gardner > --- > drivers/net/wireless/rtlwifi/pci.c | 19 ++++++++++++------- > 1 files changed, 12 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c > index 5cb2199..6b18063 100644 > --- a/drivers/net/wireless/rtlwifi/pci.c > +++ b/drivers/net/wireless/rtlwifi/pci.c > @@ -1760,8 +1760,8 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, > if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) { > RT_ASSERT(false, > "Unable to obtain 32bit DMA for consistent allocations\n"); > - pci_disable_device(pdev); > - return -ENOMEM; > + err = -ENOMEM; > + goto fail1; I would probably added a new label after the ieee80211_free_hw() and used it here to avoid the "if (hw)" test, but that is a matter of choice. In any case this patch is correct. ACKed-by: Larry Finger Thanks, Larry > } > } > > @@ -1803,7 +1803,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, > err = pci_request_regions(pdev, KBUILD_MODNAME); > if (err) { > RT_ASSERT(false, "Can't obtain PCI resources\n"); > - goto fail2; > + goto fail1; > } > > pmem_start = pci_resource_start(pdev, rtlpriv->cfg->bar_id); > @@ -1816,6 +1816,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, > rtlpriv->cfg->bar_id, pmem_len); > if (rtlpriv->io.pci_mem_start == 0) { > RT_ASSERT(false, "Can't map PCI mem\n"); > + err = -ENOMEM; > goto fail2; > } > > @@ -1832,8 +1833,10 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, > pci_write_config_byte(pdev, 0x04, 0x07); > > /* find adapter */ > - if (!_rtl_pci_find_adapter(pdev, hw)) > + if (!_rtl_pci_find_adapter(pdev, hw)) { > + err = -ENODEV; > goto fail3; > + } > > /* Init IO handler */ > _rtl_pci_io_handler_init(&pdev->dev, hw); > @@ -1843,6 +1846,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, > > if (rtlpriv->cfg->ops->init_sw_vars(hw)) { > RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n"); > + err = -ENODEV; > goto fail3; > } > > @@ -1887,7 +1891,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev, > return 0; > > fail3: > - pci_set_drvdata(pdev, NULL); > rtl_deinit_core(hw); > _rtl_pci_io_handler_release(hw); > > @@ -1899,10 +1902,12 @@ fail2: > complete(&rtlpriv->firmware_loading_complete); > > fail1: > - > + if (hw) > + ieee80211_free_hw(hw); > + pci_set_drvdata(pdev, NULL); > pci_disable_device(pdev); > > - return -ENODEV; > + return err; > > } > EXPORT_SYMBOL(rtl_pci_probe); -- 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/