Patchwork [3/4] bonding: the calling of bond->slave_cnt need protection

login
register
mail settings
Submitter dingtianhong
Date July 20, 2013, 7:23 a.m.
Message ID <51EA3B0D.7020501@huawei.com>
Download mbox | patch
Permalink /patch/260419/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

dingtianhong - July 20, 2013, 7:23 a.m.
The bonding_store_mode has rtnl protection, so no need to get read lock
for bond->slave_cnt, but the bonding_store_fail_over_mac need to protect
the bond->slave_cnt, so add read_lock().

Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
---
 drivers/net/bonding/bond_sysfs.c | 3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index dc36a3d..d01a189 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -504,11 +504,14 @@  static ssize_t bonding_store_fail_over_mac(struct device *d,
 	int new_value;
 	struct bonding *bond = to_bond(d);
 
+	read_lock(&bond->lock);
 	if (bond->slave_cnt != 0) {
 		pr_err("%s: Can't alter fail_over_mac with slaves in bond.\n",
 		       bond->dev->name);
+		read_unlock(&bond->lock);
 		return -EPERM;
 	}
+	read_unlock(&bond->lock);
 
 	new_value = bond_parse_parm(buf, fail_over_mac_tbl);
 	if (new_value < 0) {