netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] bfin_mac: fix memleak in mii_bus{probe|remove}
@ 2010-05-18  9:28 Denis Kirjanov <kirjanov@gmail.com
  2010-05-18 10:05 ` Sonic Zhang
  0 siblings, 1 reply; 6+ messages in thread
From: Denis Kirjanov <kirjanov@gmail.com @ 2010-05-18  9:28 UTC (permalink / raw)
  To: davem; +Cc: michael.hennerich, sonic.zhang, cooloney, uclinux-dist-devel,
	netdev

Fix memory leak with miibus->irq

Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
---

drivers/net/bfin_mac.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 39a54ba..7a17b8a 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -1627,6 +1627,7 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
 
 out_err_mdiobus_register:
 	mdiobus_free(miibus);
+	kfree(miibus->irq);
 out_err_alloc:
 	peripheral_free_list(pin_req);
 
@@ -1638,6 +1639,7 @@ static int __devexit bfin_mii_bus_remove(struct platform_device *pdev)
 	struct mii_bus *miibus = platform_get_drvdata(pdev);
 	platform_set_drvdata(pdev, NULL);
 	mdiobus_unregister(miibus);
+	kfree(miibus->irq);
 	mdiobus_free(miibus);
 	peripheral_free_list(pin_req);
 	return 0;

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] bfin_mac: fix memleak in mii_bus{probe|remove}
  2010-05-18  9:28 [PATCH] bfin_mac: fix memleak in mii_bus{probe|remove} Denis Kirjanov <kirjanov@gmail.com
@ 2010-05-18 10:05 ` Sonic Zhang
  2010-05-18 11:34   ` Denis Kirjanov
  0 siblings, 1 reply; 6+ messages in thread
From: Sonic Zhang @ 2010-05-18 10:05 UTC (permalink / raw)
  To: kirjanov, davem, michael.hennerich, sonic.zhang, cooloney,
	uclinux-dist-devel, netdev

2010/5/18 Denis Kirjanov <kirjanov@gmail.com <kirjanov@gmail.com>:
> Fix memory leak with miibus->irq
>
> Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
> ---
>
> drivers/net/bfin_mac.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
> index 39a54ba..7a17b8a 100644
> --- a/drivers/net/bfin_mac.c
> +++ b/drivers/net/bfin_mac.c
> @@ -1627,6 +1627,7 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
>
>  out_err_mdiobus_register:
>        mdiobus_free(miibus);
> +       kfree(miibus->irq);

Should you move this kfree before mdiobus_free?

>  out_err_alloc:
>        peripheral_free_list(pin_req);
>
> @@ -1638,6 +1639,7 @@ static int __devexit bfin_mii_bus_remove(struct platform_device *pdev)
>        struct mii_bus *miibus = platform_get_drvdata(pdev);
>        platform_set_drvdata(pdev, NULL);
>        mdiobus_unregister(miibus);
> +       kfree(miibus->irq);
>        mdiobus_free(miibus);
>        peripheral_free_list(pin_req);
>        return 0;
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] bfin_mac: fix memleak in mii_bus{probe|remove}
  2010-05-18 10:05 ` Sonic Zhang
@ 2010-05-18 11:34   ` Denis Kirjanov
  2010-05-18 21:13     ` David Miller
  0 siblings, 1 reply; 6+ messages in thread
From: Denis Kirjanov @ 2010-05-18 11:34 UTC (permalink / raw)
  To: Sonic Zhang
  Cc: davem, michael.hennerich, cooloney, uclinux-dist-devel, netdev

On Tue, May 18, 2010 at 18:05 +0800, Sonic Zhang wrote:
> 2010/5/18 Denis Kirjanov <kirjanov@gmail.com <kirjanov@gmail.com>:
> > Fix memory leak with miibus->irq
> >
> > Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
> > ---
> >
> > drivers/net/bfin_mac.c |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
> > index 39a54ba..7a17b8a 100644
> > --- a/drivers/net/bfin_mac.c
> > +++ b/drivers/net/bfin_mac.c
> > @@ -1627,6 +1627,7 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
> >
> >  out_err_mdiobus_register:
> >        mdiobus_free(miibus);
> > +       kfree(miibus->irq);
> 
> Should you move this kfree before mdiobus_free?
> 
> >  out_err_alloc:
> >        peripheral_free_list(pin_req);
> >
> > @@ -1638,6 +1639,7 @@ static int __devexit bfin_mii_bus_remove(struct platform_device *pdev)
> >        struct mii_bus *miibus = platform_get_drvdata(pdev);
> >        platform_set_drvdata(pdev, NULL);
> >        mdiobus_unregister(miibus);
> > +       kfree(miibus->irq);
> >        mdiobus_free(miibus);
> >        peripheral_free_list(pin_req);
> >        return 0;
> > --
> > To unsubscribe from this list: send the line "unsubscribe netdev" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> >
Oops, yeah, fixed.
Thanks.

[PATCH] bfin_mac: fix memleak in mii_bus_{probe|remove}
Fix memory leak with miibus->irq

Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
---
drivers/net/bfin_mac.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 39a54ba..368f333 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -1626,6 +1626,7 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
 	return 0;
 
 out_err_mdiobus_register:
+	kfree(miibus->irq);
 	mdiobus_free(miibus);
 out_err_alloc:
 	peripheral_free_list(pin_req);
@@ -1638,6 +1639,7 @@ static int __devexit bfin_mii_bus_remove(struct platform_device *pdev)
 	struct mii_bus *miibus = platform_get_drvdata(pdev);
 	platform_set_drvdata(pdev, NULL);
 	mdiobus_unregister(miibus);
+	kfree(miibus->irq);
 	mdiobus_free(miibus);
 	peripheral_free_list(pin_req);
 	return 0;


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] bfin_mac: fix memleak in mii_bus{probe|remove}
  2010-05-18 11:34   ` Denis Kirjanov
@ 2010-05-18 21:13     ` David Miller
  2010-05-18 21:15       ` David Miller
  2010-05-19  5:18       ` Denis Kirjanov
  0 siblings, 2 replies; 6+ messages in thread
From: David Miller @ 2010-05-18 21:13 UTC (permalink / raw)
  To: kirjanov; +Cc: sonic.adi, michael.hennerich, cooloney, uclinux-dist-devel,
	netdev

From: Denis Kirjanov <kirjanov@gmail.com>
Date: Tue, 18 May 2010 15:34:46 +0400

> [PATCH] bfin_mac: fix memleak in mii_bus_{probe|remove}
> Fix memory leak with miibus->irq
> 
> Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>

I've already applied the original patch.

Therefore, it makes no sense to send a fresh complete version
of the original patch to fix this.

You'll need to send a relative patch against the other one to
fix the problem.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] bfin_mac: fix memleak in mii_bus{probe|remove}
  2010-05-18 21:13     ` David Miller
@ 2010-05-18 21:15       ` David Miller
  2010-05-19  5:18       ` Denis Kirjanov
  1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2010-05-18 21:15 UTC (permalink / raw)
  To: kirjanov; +Cc: sonic.adi, michael.hennerich, cooloney, uclinux-dist-devel,
	netdev

From: David Miller <davem@davemloft.net>
Date: Tue, 18 May 2010 14:13:18 -0700 (PDT)

> From: Denis Kirjanov <kirjanov@gmail.com>
> Date: Tue, 18 May 2010 15:34:46 +0400
> 
>> [PATCH] bfin_mac: fix memleak in mii_bus_{probe|remove}
>> Fix memory leak with miibus->irq
>> 
>> Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
> 
> I've already applied the original patch.

Sorry, ignore this, I didn't see that this is a new patch.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] bfin_mac: fix memleak in mii_bus{probe|remove}
  2010-05-18 21:13     ` David Miller
  2010-05-18 21:15       ` David Miller
@ 2010-05-19  5:18       ` Denis Kirjanov
  1 sibling, 0 replies; 6+ messages in thread
From: Denis Kirjanov @ 2010-05-19  5:18 UTC (permalink / raw)
  To: David Miller
  Cc: michael.hennerich, sonic.zhang, cooloney, uclinux-dist-devel,
	netdev

On Tue, May 18, 2010 at 14:13 -0700, David Miller wrote:
> From: Denis Kirjanov <kirjanov@gmail.com>
> Date: Tue, 18 May 2010 15:34:46 +0400
> 
> > [PATCH] bfin_mac: fix memleak in mii_bus_{probe|remove}
> > Fix memory leak with miibus->irq
> > 
> > Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
> 
> I've already applied the original patch.
> 
> Therefore, it makes no sense to send a fresh complete version
> of the original patch to fix this.
> 
> You'll need to send a relative patch against the other one to
> fix the problem.
Ok, here it is. Sorry for the previous one.

[PATCH] bfin_mac: fix invalid pointer dereference in bfin_mii_bus_probe
Fix invalid memory access.

Signed-off-by: Denis Kirjanov: <dkirjanov@kernel.org>
---

drivers/net/bfin_mac.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index 7a17b8a..368f333 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -1626,8 +1626,8 @@ static int __devinit bfin_mii_bus_probe(struct platform_device *pdev)
 	return 0;
 
 out_err_mdiobus_register:
-	mdiobus_free(miibus);
 	kfree(miibus->irq);
+	mdiobus_free(miibus);
 out_err_alloc:
 	peripheral_free_list(pin_req);
 

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-05-19  5:16 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-18  9:28 [PATCH] bfin_mac: fix memleak in mii_bus{probe|remove} Denis Kirjanov <kirjanov@gmail.com
2010-05-18 10:05 ` Sonic Zhang
2010-05-18 11:34   ` Denis Kirjanov
2010-05-18 21:13     ` David Miller
2010-05-18 21:15       ` David Miller
2010-05-19  5:18       ` Denis Kirjanov

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).