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

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

[Nikolay Aleksandrov]

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.

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
---
 drivers/net/bonding/bond_3ad.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 1720742..96d471e 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -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 *port)
 {
 	// make sure it isn't called twice
-	spin_lock_init(&(SLAVE_AD_INFO(port->slave).state_machine_lock));
+	spin_lock_init(&(SLAVE_AD_INFO(port).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);
-- 
1.7.11.7

Re: [PATCH] bonding: Fix initialize after use for 3ad machine state spinlock

[David Miller]

When submitting multiple changes to the same area in a group, you must
number your changes.

Using tools such as "git send-email ..." will do this automatically
for you, otherwise you must put numberings into your subject lines
by hand.

Re: [PATCH] bonding: Fix initialize after use for 3ad machine state spinlock

[Nikolay Aleksandrov]

On 18/02/13 18:02, David Miller wrote:
> 
> When submitting multiple changes to the same area in a group, you must
> number your changes.
> 
> Using tools such as "git send-email ..." will do this automatically
> for you, otherwise you must put numberings into your subject lines
> by hand.

Thanks for the advice, I must've accidentally removed the numbering
while re-basing as I used git send-email.
Should I post a v2 with numbering ?
The actual order of applying these 2 doesn't matter as they touch
different parts, and if applied in reverse will only spill an offset -1.

Nik

Re: [PATCH] bonding: Fix initialize after use for 3ad machine state spinlock

[David Miller]

From: Nikolay Aleksandrov <nikolay@redhat.com>
Date: Mon, 18 Feb 2013 18:43:13 +0100

> Should I post a v2 with numbering ?

You should resubmit all 3 bonding patches you submitted, with proper
numbering.

Re: [PATCH] bonding: Fix initialize after use for 3ad machine state spinlock

[Nikolay Aleksandrov]

On 18/02/13 18:44, David Miller wrote:
> From: Nikolay Aleksandrov <nikolay@redhat.com>
> Date: Mon, 18 Feb 2013 18:43:13 +0100
> 
>> Should I post a v2 with numbering ?
> 
> You should resubmit all 3 bonding patches you submitted, with proper
> numbering.
Okay, will do. Just to note 2 of the patches are for net, and 1 is for
the net-next tree. That information will be included in the subject as
usual.

Thanks,
 Nik