bonding: add rtnl lock for bonding_store_xmit_hash

PATCH Superseded Ding Tianhong 1 participant 1 message Aug 30, 2013

Subsystems (3)

Networking Network drivers Bonding driver

lore

Share & tools

lore

Ding Tianhong

author

2013-08-30 10:08 UTC #0 lore raw

PATCH 4/6 bonding: add rtnl lock for bonding_store_xmit_hash

the bonding_store_xmit_hash() could update bond's xmit_policy, and the xmit_policy is used in xmit path for xor mode, maybe it is hard to occur any problem, but just follow the logic "don't change anything slave-related without rtnl", so I think the rntl lock is fit here. :)

Signed-off-by Ding Tianhong <[email protected]>

Cc Nikolay Aleksandrov <[email protected]>

---
 drivers/net/bonding/bond_sysfs.c | 4 ++++
 1 file changed, 4 insertions(+)

drivers/net/bonding/bond_sysfs.c +4 -0

index 0f539de..deb1d8e 100644
@@ -382,6 +382,9 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
 	int new_value, ret = count;
 	struct bonding *bond = to_bond(d);
 
+	if (!rtnl_trylock())
+		return restart_syscall();
+
 	new_value = bond_parse_parm(buf, xmit_hashtype_tbl);
 	if (new_value < 0)  {
 		pr_err("%s: Ignoring invalid xmit hash policy value %.*s.\n",

@@ -396,6 +399,7 @@ static ssize_t bonding_store_xmit_hash(struct device *d,
 			xmit_hashtype_tbl[new_value].modename, new_value);
 	}
 
+	rtnl_unlock();
 	return ret;
 }
 static DEVICE_ATTR(xmit_hash_policy, S_IRUGO | S_IWUSR,

Signature · 1 line

1.8.2.1