* [PATCH] net/bridge: use kobject_put to release kobject in br_add_if error path
@ 2009-07-24 9:06 Xiaotian Feng
2009-07-24 15:36 ` Stephen Hemminger
0 siblings, 1 reply; 3+ messages in thread
From: Xiaotian Feng @ 2009-07-24 9:06 UTC (permalink / raw)
To: davem, shemminger; +Cc: bridge, netdev, linux-kernel, Xiaotian Feng
kobject_init_and_add will alloc memory for kobj->name, so in br_add_if
error path, simply use kobject_del will not free memory for kobj->name.
Fix by using kobject_put instead, kobject_put will internally calls
kobject_del and frees memory for kobj->name.
Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
---
net/bridge/br_if.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 8a96672..eb404dc 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -424,7 +424,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
err2:
br_fdb_delete_by_port(br, p, 1);
err1:
- kobject_del(&p->kobj);
+ kobject_put(&p->kobj);
err0:
dev_set_promiscuity(dev, -1);
put_back:
--
1.6.2.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] net/bridge: use kobject_put to release kobject in br_add_if error path
2009-07-24 9:06 [PATCH] net/bridge: use kobject_put to release kobject in br_add_if error path Xiaotian Feng
@ 2009-07-24 15:36 ` Stephen Hemminger
2009-07-27 2:21 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Hemminger @ 2009-07-24 15:36 UTC (permalink / raw)
To: Xiaotian Feng; +Cc: davem, bridge, netdev, linux-kernel, Xiaotian Feng
On Fri, 24 Jul 2009 17:06:32 +0800
Xiaotian Feng <dfeng@redhat.com> wrote:
> kobject_init_and_add will alloc memory for kobj->name, so in br_add_if
> error path, simply use kobject_del will not free memory for kobj->name.
> Fix by using kobject_put instead, kobject_put will internally calls
> kobject_del and frees memory for kobj->name.
>
> Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
> ---
> net/bridge/br_if.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
> index 8a96672..eb404dc 100644
> --- a/net/bridge/br_if.c
> +++ b/net/bridge/br_if.c
> @@ -424,7 +424,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
> err2:
> br_fdb_delete_by_port(br, p, 1);
> err1:
> - kobject_del(&p->kobj);
> + kobject_put(&p->kobj);
> err0:
> dev_set_promiscuity(dev, -1);
> put_back:
I assume you tested this by doing something like adding two interfaces
with the same MAC address to a bridge.
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
--
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net/bridge: use kobject_put to release kobject in br_add_if error path
2009-07-24 15:36 ` Stephen Hemminger
@ 2009-07-27 2:21 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2009-07-27 2:21 UTC (permalink / raw)
To: shemminger; +Cc: dfeng, bridge, netdev, linux-kernel
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Fri, 24 Jul 2009 08:36:07 -0700
> On Fri, 24 Jul 2009 17:06:32 +0800
> Xiaotian Feng <dfeng@redhat.com> wrote:
>
>> kobject_init_and_add will alloc memory for kobj->name, so in br_add_if
>> error path, simply use kobject_del will not free memory for kobj->name.
>> Fix by using kobject_put instead, kobject_put will internally calls
>> kobject_del and frees memory for kobj->name.
>>
>> Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
...
>
> I assume you tested this by doing something like adding two interfaces
> with the same MAC address to a bridge.
>
> Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-07-27 2:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-24 9:06 [PATCH] net/bridge: use kobject_put to release kobject in br_add_if error path Xiaotian Feng
2009-07-24 15:36 ` Stephen Hemminger
2009-07-27 2:21 ` David Miller
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).