Skip to contentSkip to conversation

net/bridge: use kobject_put to release kobject in br_add_if error path

PATCH Applied Xiaotian Feng 3 participants 3 messages Jul 24, 2009 – Jul 27, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/bridge: use kobject_put to release kobject in br_add_if error path

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.

---
 net/bridge/br_if.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
net/bridge/br_if.c +1 -1
index 8a96672..eb404dc 100644
@@ -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:
Signature · 1 line
1.6.2.5
Acked-by on v1 1/1
#1 lore raw
Quoted 15 lines · On Fri, 24 Jul 2009 17:06:32 +0800 Xiaotian Feng <[email protected]> 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.

---
 net/bridge/br_if.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
net/bridge/br_if.c +0 -0
index 8a96672..eb404dc 100644

net/bridge/br_if.c int br_add_if(struct net_bridge *br, struct net_device *dev) · line 430

Quoted 8 lines
net/bridge/br_if.c +1 -1
@@ -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.

maintainer Applied
#2 lore raw

From: Stephen Hemminger <[email protected]>
Date: Fri, 24 Jul 2009 08:36:07 -0700

Quoted 9 lines
Quoted 6 lines · On Fri, 24 Jul 2009 17:06:32 +0800 Xiaotian Feng <[email protected]> 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.

...

Quoted 5 lines

I assume you tested this by doing something like adding two interfaces with the same MAC address to a bridge.

Applied, thanks!