Re: [PATCH 1/2] drivers/misc/cb710/core.c: Add missing pci_dev_put

Re: [PATCH 1/2] drivers/misc/cb710/core.c: Add missing pci_dev_put

[Michał Mirosław]

On Thu, Jul 28, 2011 at 06:26:46PM +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
> Pci_get_slot calls pci_dev_get, so pci_dev_put is needed before leaving the
> function.
[...]
> --- a/drivers/misc/cb710/core.c
> +++ b/drivers/misc/cb710/core.c
> @@ -41,7 +41,7 @@ static int __devinit cb710_pci_configure(struct pci_dev *pdev)
>  
>  	pci_read_config_dword(pdev, 0x48, &val);
>  	if (val & 0x80000000)
> -		return 0;
> +		goto out;
>  
>  	if (!pdev0)
>  		return -ENODEV;

The good fix is to use pci_get_slot() before the !pdev0 condition above.
I'll send a patch shortly.

Best Regards,
Micha³ Miros³aw
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] cb710: fix possible pci_dev leak in

[Michał Mirosław]

Reported-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/misc/cb710/core.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c
index efec413..68cd05b 100644
--- a/drivers/misc/cb710/core.c
+++ b/drivers/misc/cb710/core.c
@@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(cb710_pci_update_config_reg);
 static int __devinit cb710_pci_configure(struct pci_dev *pdev)
 {
 	unsigned int devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
-	struct pci_dev *pdev0 = pci_get_slot(pdev->bus, devfn);
+	struct pci_dev *pdev0;
 	u32 val;
 
 	cb710_pci_update_config_reg(pdev, 0x48,
@@ -43,6 +43,7 @@ static int __devinit cb710_pci_configure(struct pci_dev *pdev)
 	if (val & 0x80000000)
 		return 0;
 
+	pdev0 = pci_get_slot(pdev->bus, devfn);
 	if (!pdev0)
 		return -ENODEV;
 
-- 
1.7.5.4

Re: [PATCH] cb710: fix possible pci_dev leak in cb710_pci_configure()

[Chris Ball]

Hi Michał,

On Thu, Jul 28 2011, Michał Mirosław wrote:
> Reported-by: Julia Lawall <julia@diku.dk>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> ---
>  drivers/misc/cb710/core.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c
> index efec413..68cd05b 100644
> --- a/drivers/misc/cb710/core.c
> +++ b/drivers/misc/cb710/core.c
> @@ -33,7 +33,7 @@ EXPORT_SYMBOL_GPL(cb710_pci_update_config_reg);
>  static int __devinit cb710_pci_configure(struct pci_dev *pdev)
>  {
>  	unsigned int devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0);
> -	struct pci_dev *pdev0 = pci_get_slot(pdev->bus, devfn);
> +	struct pci_dev *pdev0;
>  	u32 val;
>  
>  	cb710_pci_update_config_reg(pdev, 0x48,
> @@ -43,6 +43,7 @@ static int __devinit cb710_pci_configure(struct pci_dev *pdev)
>  	if (val & 0x80000000)
>  		return 0;
>  
> +	pdev0 = pci_get_slot(pdev->bus, devfn);
>  	if (!pdev0)
>  		return -ENODEV;

Pushed to mmc-next for 3.1, thanks.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child