提交 e0809dbc 编写于 作者: N nikolay@redhat.com 提交者: David S. Miller

bonding: Fix initialize after use for 3ad machine state spinlock

The 3ad machine state spinlock can be used before it is inititialized
while doing bond_enslave() (and the port is being initialized) since
port->slave is set before the lock is prepared, thus causing soft
lock-ups and a multitude of other nasty bugs.

[ Rename __initialize_port_locks() variable name to 'slave' -DaveM ]
Signed-off-by: NNikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 b59340c2
......@@ -389,13 +389,13 @@ static u8 __get_duplex(struct port *port)
/**
* __initialize_port_locks - initialize a port's STATE machine spinlock
* @port: the port we're looking at
* @port: the slave of the port we're looking at
*
*/
static inline void __initialize_port_locks(struct port *port)
static inline void __initialize_port_locks(struct slave *slave)
{
// make sure it isn't called twice
spin_lock_init(&(SLAVE_AD_INFO(port->slave).state_machine_lock));
spin_lock_init(&(SLAVE_AD_INFO(slave).state_machine_lock));
}
//conversions
......@@ -1910,6 +1910,7 @@ int bond_3ad_bind_slave(struct slave *slave)
ad_initialize_port(port, bond->params.lacp_fast);
__initialize_port_locks(slave);
port->slave = slave;
port->actor_port_number = SLAVE_AD_INFO(slave).id;
// key is determined according to the link speed, duplex and user key(which is yet not supported)
......@@ -1932,8 +1933,6 @@ int bond_3ad_bind_slave(struct slave *slave)
port->next_port_in_aggregator = NULL;
__disable_port(port);
__initialize_port_locks(port);
// aggregator initialization
aggregator = &(SLAVE_AD_INFO(slave).aggregator);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册