Re: [PATCH] net/bridge: use kobject_put to release kobject inbr_add_if error path

From: Stephen Hemminger
Date: Fri Jul 24 2009 - 11:36:38 EST


On Fri, 24 Jul 2009 17:06:32 +0800
Xiaotian Feng <dfeng@xxxxxxxxxx> 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@xxxxxxxxxx>
> ---
> 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@xxxxxxxxxx>

--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/