* Re: [PATCH] eth16i: fix memory leak
@ 2010-07-13 11:43 ` Dan Carpenter
0 siblings, 0 replies; 10+ messages in thread
From: Dan Carpenter @ 2010-07-13 11:43 UTC (permalink / raw)
To: Kulikov Vasiliy
Cc: kernel-janitors, Mika Kuoppala, David S. Miller,
Stephen Hemminger, Eric Dumazet, Tejun Heo, Jiri Pirko, netdev
On Tue, Jul 13, 2010 at 03:22:18PM +0400, Kulikov Vasiliy wrote:
> Free allocated netdev if no probe is expected.
>
> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
> ---
> drivers/net/eth16i.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
> index 874973f..2bdd394 100644
> --- a/drivers/net/eth16i.c
> +++ b/drivers/net/eth16i.c
> @@ -1442,8 +1442,10 @@ int __init init_module(void)
> dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]);
>
> if(io[this_dev] == 0) {
> - if(this_dev != 0) /* Only autoprobe 1st one */
> + if (this_dev != 0) { /* Only autoprobe 1st one */
> + free_netdev(def);
^^^
free_netdev(dev);
regards,
dan carpenter
> break;
> + }
>
> printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n");
> }
> --
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] eth16i: fix memory leak
2010-07-13 11:43 ` Dan Carpenter
@ 2010-07-13 19:48 ` Kulikov Vasiliy
-1 siblings, 0 replies; 10+ messages in thread
From: Kulikov Vasiliy @ 2010-07-13 19:48 UTC (permalink / raw)
To: Dan Carpenter
Cc: kernel-janitors, Mika Kuoppala, David S. Miller,
Stephen Hemminger, Eric Dumazet, Tejun Heo, Jiri Pirko, netdev
On Tue, Jul 13, 2010 at 13:43 +0200, Dan Carpenter wrote:
> On Tue, Jul 13, 2010 at 03:22:18PM +0400, Kulikov Vasiliy wrote:
> > Free allocated netdev if no probe is expected.
> >
> > Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
> > ---
> > drivers/net/eth16i.c | 4 +++-
> > 1 files changed, 3 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
> > index 874973f..2bdd394 100644
> > --- a/drivers/net/eth16i.c
> > +++ b/drivers/net/eth16i.c
> > @@ -1442,8 +1442,10 @@ int __init init_module(void)
> > dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]);
> >
> > if(io[this_dev] = 0) {
> > - if(this_dev != 0) /* Only autoprobe 1st one */
> > + if (this_dev != 0) { /* Only autoprobe 1st one */
> > + free_netdev(def);
> ^^^
> free_netdev(dev);
Heh, this function is surrounded with #ifdef MODULE #endif, so this typo
was not detected at my test nonmoduled compilation. Thanks.
Patch v2 is comming.
>
> regards,
> dan carpenter
>
> > break;
> > + }
> >
> > printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n");
> > }
> > --
>
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH] eth16i: fix memory leak
@ 2010-07-13 19:48 ` Kulikov Vasiliy
0 siblings, 0 replies; 10+ messages in thread
From: Kulikov Vasiliy @ 2010-07-13 19:48 UTC (permalink / raw)
To: Dan Carpenter
Cc: kernel-janitors, Mika Kuoppala, David S. Miller,
Stephen Hemminger, Eric Dumazet, Tejun Heo, Jiri Pirko, netdev
On Tue, Jul 13, 2010 at 13:43 +0200, Dan Carpenter wrote:
> On Tue, Jul 13, 2010 at 03:22:18PM +0400, Kulikov Vasiliy wrote:
> > Free allocated netdev if no probe is expected.
> >
> > Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
> > ---
> > drivers/net/eth16i.c | 4 +++-
> > 1 files changed, 3 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
> > index 874973f..2bdd394 100644
> > --- a/drivers/net/eth16i.c
> > +++ b/drivers/net/eth16i.c
> > @@ -1442,8 +1442,10 @@ int __init init_module(void)
> > dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]);
> >
> > if(io[this_dev] == 0) {
> > - if(this_dev != 0) /* Only autoprobe 1st one */
> > + if (this_dev != 0) { /* Only autoprobe 1st one */
> > + free_netdev(def);
> ^^^
> free_netdev(dev);
Heh, this function is surrounded with #ifdef MODULE #endif, so this typo
was not detected at my test nonmoduled compilation. Thanks.
Patch v2 is comming.
>
> regards,
> dan carpenter
>
> > break;
> > + }
> >
> > printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n");
> > }
> > --
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2] eth16i: fix memory leak
2010-07-13 11:43 ` Dan Carpenter
@ 2010-07-13 19:49 ` Kulikov Vasiliy
-1 siblings, 0 replies; 10+ messages in thread
From: Kulikov Vasiliy @ 2010-07-13 19:49 UTC (permalink / raw)
To: kernel-janitors
Cc: Mika Kuoppala, David S. Miller, Stephen Hemminger, Eric Dumazet,
Tejun Heo, Jiri Pirko, netdev
Free allocated netdev if no probe is expected.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
drivers/net/eth16i.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index 874973f..10e39f2 100644
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -1442,8 +1442,10 @@ int __init init_module(void)
dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]);
if(io[this_dev] = 0) {
- if(this_dev != 0) /* Only autoprobe 1st one */
+ if (this_dev != 0) { /* Only autoprobe 1st one */
+ free_netdev(dev);
break;
+ }
printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n");
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2] eth16i: fix memory leak
@ 2010-07-13 19:49 ` Kulikov Vasiliy
0 siblings, 0 replies; 10+ messages in thread
From: Kulikov Vasiliy @ 2010-07-13 19:49 UTC (permalink / raw)
To: kernel-janitors
Cc: Mika Kuoppala, David S. Miller, Stephen Hemminger, Eric Dumazet,
Tejun Heo, Jiri Pirko, netdev
Free allocated netdev if no probe is expected.
Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
drivers/net/eth16i.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c
index 874973f..10e39f2 100644
--- a/drivers/net/eth16i.c
+++ b/drivers/net/eth16i.c
@@ -1442,8 +1442,10 @@ int __init init_module(void)
dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]);
if(io[this_dev] == 0) {
- if(this_dev != 0) /* Only autoprobe 1st one */
+ if (this_dev != 0) { /* Only autoprobe 1st one */
+ free_netdev(dev);
break;
+ }
printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n");
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2] eth16i: fix memory leak
2010-07-13 19:49 ` Kulikov Vasiliy
@ 2010-07-15 0:57 ` David Miller
-1 siblings, 0 replies; 10+ messages in thread
From: David Miller @ 2010-07-15 0:57 UTC (permalink / raw)
To: segooon; +Cc: kernel-janitors, miku, shemminger, eric.dumazet, tj, jpirko,
netdev
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Tue, 13 Jul 2010 23:49:23 +0400
> Free allocated netdev if no probe is expected.
>
> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 10+ messages in thread