On Wed, 21 Feb 2007 01:19:41 +0300
Oleg Nesterov <[email protected]> wrote:
> If del_nbp()->cancel_delayed_work(carrier_check) fails, port_carrier_check()
> may run later and access an already freed container (struct net_bridge_port).
>
> With this patch, carrier_check owns a reference to "struct net_bridge_port",
> not net_device, so it is always safe to acces the container.
>
> port_carrier_check() uses p->dev->br_port == NULL as indication that net_bridge_port
> is under destruction. Otherwise it assumes that p->dev->br_port == p.
>
> Signed-off-by: Oleg Nesterov <[email protected]>
> Acked-By: David Howells <[email protected]>
>
> --- WQ/net/bridge/br_if.c~5_bridge_uaf 2007-02-18 23:06:15.000000000 +0300
> +++ WQ/net/bridge/br_if.c 2007-02-20 00:59:54.000000000 +0300
> @@ -83,14 +83,14 @@ static void port_carrier_check(struct wo
> struct net_device *dev;
> struct net_bridge *br;
>
> - dev = container_of(work, struct net_bridge_port,
> - carrier_check.work)->dev;
> + p = container_of(work, struct net_bridge_port, carrier_check.work);
>
> rtnl_lock();
> - p = dev->br_port;
> - if (!p)
> - goto done;
> br = p->br;
> + dev = p->dev;
> +
> + if (!dev->br_port)
> + goto done;
>
> if (netif_carrier_ok(dev))
> p->path_cost = port_cost(dev);
> @@ -107,14 +107,16 @@ static void port_carrier_check(struct wo
> spin_unlock_bh(&br->lock);
> }
> done:
> - dev_put(dev);
> rtnl_unlock();
> + kobject_put(&p->kobj);
> }
>
> static void release_nbp(struct kobject *kobj)
> {
> struct net_bridge_port *p
> = container_of(kobj, struct net_bridge_port, kobj);
> +
> + dev_put(p->dev);
> kfree(p);
> }
>
> @@ -127,12 +129,6 @@ static struct kobj_type brport_ktype = {
>
> static void destroy_nbp(struct net_bridge_port *p)
> {
> - struct net_device *dev = p->dev;
> -
> - p->br = NULL;
> - p->dev = NULL;
> - dev_put(dev);
> -
> kobject_put(&p->kobj);
> }
Moving this around is problematic.
The ordering here was chosen to be RCU friendly so that
p->dev indicates the port is in process of being deleted but traffic
may still be using old reference, but new traffic should not use it.
Probably the best thing to do is pull the whole delayed work queue
and auto port speed stuff. When STP is moved to user space then
it can do the ethtool op there.
--
Stephen Hemminger <[email protected]>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
