diff options
| author | Wang Chen <wangchen@cn.fujitsu.com> | 2008-07-14 20:53:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-14 20:53:13 -0700 |
| commit | bc3f9076f671f128c82022428992c30be57f22d5 (patch) | |
| tree | ec3ecf7cf8d22e9a319f832650b5edb1634ec9f3 /net/bridge | |
| parent | 7e1a1ac1fbaa88fe254400b7f30b775502932ad3 (diff) | |
| download | linux-3.10-bc3f9076f671f128c82022428992c30be57f22d5.tar.gz linux-3.10-bc3f9076f671f128c82022428992c30be57f22d5.tar.bz2 linux-3.10-bc3f9076f671f128c82022428992c30be57f22d5.zip | |
bridge: Check return of dev_set_promiscuity
dev_set_promiscuity/allmulti might overflow.
Commit: "netdevice: Fix promiscuity and allmulti overflow" in net-next makes
dev_set_promiscuity/allmulti return error number if overflow happened.
Here, we check the positive increment for promiscuity to get error return.
Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_if.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 497df086141..a072ea5ca6f 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -373,6 +373,10 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) if (IS_ERR(p)) return PTR_ERR(p); + err = dev_set_promiscuity(dev, 1); + if (err) + goto put_back; + err = kobject_init_and_add(&p->kobj, &brport_ktype, &(dev->dev.kobj), SYSFS_BRIDGE_PORT_ATTR); if (err) @@ -388,7 +392,6 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) rcu_assign_pointer(dev->br_port, p); dev_disable_lro(dev); - dev_set_promiscuity(dev, 1); list_add_rcu(&p->list, &br->port_list); @@ -412,12 +415,12 @@ err2: br_fdb_delete_by_port(br, p, 1); err1: kobject_del(&p->kobj); - goto put_back; err0: kobject_put(&p->kobj); - + dev_set_promiscuity(dev, -1); put_back: dev_put(dev); + kfree(p); return err; } |