aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornikolay@redhat.com <nikolay@redhat.com>2012-11-28 20:37:59 -0500
committerDavid S. Miller <davem@davemloft.net>2012-11-29 13:13:15 -0500
commite196c0e579902f42cf72414461fb034e5a1ffbf7 (patch)
treefb17f8a56d9e8f51c26cfd6b4abf0212aa617aee
parent90fb6250c509cabd425b7ae4524053dba2e27e2c (diff)
bonding: fix race condition in bonding_store_slaves_active
Race between bonding_store_slaves_active() and slave manipulation functions. The bond_for_each_slave use in bonding_store_slaves_active() is not protected by any synchronization mechanism. NULL pointer dereference is easy to reach. Fixed by acquiring the bond->lock for the slave walk. v2: Make description text < 75 columns Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com> Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bonding/bond_sysfs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 3327a072e224..1877ed7ca086 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1568,6 +1568,7 @@ static ssize_t bonding_store_slaves_active(struct device *d,
1568 goto out; 1568 goto out;
1569 } 1569 }
1570 1570
1571 read_lock(&bond->lock);
1571 bond_for_each_slave(bond, slave, i) { 1572 bond_for_each_slave(bond, slave, i) {
1572 if (!bond_is_active_slave(slave)) { 1573 if (!bond_is_active_slave(slave)) {
1573 if (new_value) 1574 if (new_value)
@@ -1576,6 +1577,7 @@ static ssize_t bonding_store_slaves_active(struct device *d,
1576 slave->inactive = 1; 1577 slave->inactive = 1;
1577 } 1578 }
1578 } 1579 }
1580 read_unlock(&bond->lock);
1579out: 1581out:
1580 return ret; 1582 return ret;
1581} 1583}