lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Fri, 20 Jun 2008 20:48:55 -0700
From:	Stephen Hemminger <shemminger@...tta.com>
To:	"David S. Miller" <davem@...emloft.net>
Cc:	Wang Chen <wangchen@...fujitsu.com>,
	NETDEV <netdev@...r.kernel.org>,
	Patrick McHardy <kaber@...sh.net>
Subject: [PATCH] bridge: Check return of dev_set_promiscuity (v2)

Alternate version of Wang Chen's patch to handle dev_set_promiscuity
errors.  I tried and make unwinds clearer here. The kobject_put can
just be replace by immediate kfree since object never gets registered
if going through that path.

Signed-off-by: Stephen Hemminger <shemminger@...tta.com>

--- a/net/bridge/br_if.c	2008-06-20 15:57:51.000000000 -0700
+++ b/net/bridge/br_if.c	2008-06-20 16:15:47.000000000 -0700
@@ -373,10 +373,15 @@ int br_add_if(struct net_bridge *br, str
 	if (IS_ERR(p))
 		return PTR_ERR(p);
 
+	err = dev_set_promiscuity(dev, 1);
+	if (err)
+		goto err_free;
+
+
 	err = kobject_init_and_add(&p->kobj, &brport_ktype, &(dev->dev.kobj),
 				   SYSFS_BRIDGE_PORT_ATTR);
 	if (err)
-		goto err0;
+		goto err_unset_promiscuity;
 
 	err = br_fdb_insert(br, p, dev->dev_addr);
 	if (err)
@@ -388,7 +393,6 @@ int br_add_if(struct net_bridge *br, str
 
 	rcu_assign_pointer(dev->br_port, p);
 	dev_disable_lro(dev);
-	dev_set_promiscuity(dev, 1);
 
 	list_add_rcu(&p->list, &br->port_list);
 
@@ -408,14 +412,17 @@ int br_add_if(struct net_bridge *br, str
 	kobject_uevent(&p->kobj, KOBJ_ADD);
 
 	return 0;
+
 err2:
 	br_fdb_delete_by_port(br, p, 1);
 err1:
 	kobject_del(&p->kobj);
 	goto put_back;
-err0:
-	kobject_put(&p->kobj);
 
+err_unset_promiscuity:
+	dev_set_promiscuity(dev, -1);
+err_free:
+	kfree(p);
 put_back:
 	dev_put(dev);
 	return err;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Powered by blists - more mailing lists