This patch fixes two memotry leaks spotted by the Coverity checker.
Signed-off-by: Adrian Bunk <[email protected]>
---
drivers/net/wireless/hostap/hostap_pci.c | 6 +++---
drivers/net/wireless/hostap/hostap_plx.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
--- linux-2.6.16-rc6-mm1-full/drivers/net/wireless/hostap/hostap_pci.c.old 2006-03-13 22:34:30.000000000 +0100
+++ linux-2.6.16-rc6-mm1-full/drivers/net/wireless/hostap/hostap_pci.c 2006-03-13 22:37:57.000000000 +0100
@@ -301,14 +301,14 @@ static int prism2_pci_probe(struct pci_d
struct hostap_interface *iface;
struct hostap_pci_priv *hw_priv;
+ if (pci_enable_device(pdev))
+ return -EIO;
+
hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
if (hw_priv == NULL)
return -ENOMEM;
memset(hw_priv, 0, sizeof(*hw_priv));
- if (pci_enable_device(pdev))
- return -EIO;
-
phymem = pci_resource_start(pdev, 0);
if (!request_mem_region(phymem, pci_resource_len(pdev, 0), "Prism2")) {
--- linux-2.6.16-rc6-mm1-full/drivers/net/wireless/hostap/hostap_plx.c.old 2006-03-13 22:39:40.000000000 +0100
+++ linux-2.6.16-rc6-mm1-full/drivers/net/wireless/hostap/hostap_plx.c 2006-03-13 22:40:09.000000000 +0100
@@ -446,14 +446,14 @@ static int prism2_plx_probe(struct pci_d
int tmd7160;
struct hostap_plx_priv *hw_priv;
+ if (pci_enable_device(pdev))
+ return -EIO;
+
hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
if (hw_priv == NULL)
return -ENOMEM;
memset(hw_priv, 0, sizeof(*hw_priv));
- if (pci_enable_device(pdev))
- return -EIO;
-
/* National Datacomm NCP130 based on TMD7160, not PLX9052. */
tmd7160 = (pdev->vendor == 0x15e8) && (pdev->device == 0x0131);
Adrian Bunk <[email protected]> wrote:
>
> + if (pci_enable_device(pdev))
> + return -EIO;
> +
> hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
> if (hw_priv == NULL)
> return -ENOMEM;
> memset(hw_priv, 0, sizeof(*hw_priv));
>
> - if (pci_enable_device(pdev))
> - return -EIO;
> -
You've just turned it into a leak of a different kind.
Why not jump to the error exit instead?
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
On Monday 13 March 2006 23:28, you wrote:
> This patch fixes two memotry leaks spotted by the Coverity checker.
>
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
>
> drivers/net/wireless/hostap/hostap_pci.c | 6 +++---
> drivers/net/wireless/hostap/hostap_plx.c | 6 +++---
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> --- linux-2.6.16-rc6-mm1-full/drivers/net/wireless/hostap/hostap_pci.c.old 2006-03-13 22:34:30.000000000 +0100
> +++ linux-2.6.16-rc6-mm1-full/drivers/net/wireless/hostap/hostap_pci.c 2006-03-13 22:37:57.000000000 +0100
> @@ -301,14 +301,14 @@ static int prism2_pci_probe(struct pci_d
> struct hostap_interface *iface;
> struct hostap_pci_priv *hw_priv;
>
> + if (pci_enable_device(pdev))
> + return -EIO;
> +
> hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
> if (hw_priv == NULL)
+ pci_disable_device(pdev);
> return -ENOMEM;
> memset(hw_priv, 0, sizeof(*hw_priv));
>
> - if (pci_enable_device(pdev))
> - return -EIO;
> -
> phymem = pci_resource_start(pdev, 0);
>
> if (!request_mem_region(phymem, pci_resource_len(pdev, 0), "Prism2")) {
> --- linux-2.6.16-rc6-mm1-full/drivers/net/wireless/hostap/hostap_plx.c.old 2006-03-13 22:39:40.000000000 +0100
> +++ linux-2.6.16-rc6-mm1-full/drivers/net/wireless/hostap/hostap_plx.c 2006-03-13 22:40:09.000000000 +0100
> @@ -446,14 +446,14 @@ static int prism2_plx_probe(struct pci_d
> int tmd7160;
> struct hostap_plx_priv *hw_priv;
>
> + if (pci_enable_device(pdev))
> + return -EIO;
> +
> hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
> if (hw_priv == NULL)
Seems like pci_disable_device should be done here, too.
> return -ENOMEM;
> memset(hw_priv, 0, sizeof(*hw_priv));
>
> - if (pci_enable_device(pdev))
> - return -EIO;
> -
> /* National Datacomm NCP130 based on TMD7160, not PLX9052. */
> tmd7160 = (pdev->vendor == 0x15e8) && (pdev->device == 0x0131);
--
Greetings Michael.
On Mon, Mar 13, 2006 at 11:28:41PM +0100, Adrian Bunk wrote:
> This patch fixes two memotry leaks spotted by the Coverity checker.
Thanks. I'll make a bit different patch to resolve this and related PCI
"leaks" in one change. I'm going through the Coverity reports for Host
AP driver, so I'll include other fixes in a patch set, too.
--
Jouni Malinen PGP id EFC895FA
On Tue, Mar 14, 2006 at 07:16:25PM -0800, Jouni Malinen wrote:
> On Mon, Mar 13, 2006 at 11:28:41PM +0100, Adrian Bunk wrote:
> > This patch fixes two memotry leaks spotted by the Coverity checker.
>
> Thanks. I'll make a bit different patch to resolve this and related PCI
> "leaks" in one change. I'm going through the Coverity reports for Host
> AP driver, so I'll include other fixes in a patch set, too.
Thanks (I assume you've seem Herbert's comment why my patch was wrong).
> Jouni Malinen PGP id EFC895FA
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed