Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 108db736 authored by dingtianhong's avatar dingtianhong Committed by David S. Miller
Browse files

bonding: protect port for bond_3ad_handle_link_change() 



The bond_3ad_handle_link_change is called with RTNL only,
and the function will modify the port's information with
no further locking, it will not mutex against bond state
machine and incoming LACPDU which do not hold RTNL, So I
add __get_state_machine_lock to protect the port.

But it is not a critical bug, it exist since day one, and till
now it has never been hit and reported, because changes to
speed is very rare, and will not occur critical problem.

The comments in the function is very old, cleanup it and
add a new pr_debug to debug the port message.

Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bca44a73

drivers/net/bonding/bond_3ad.c

+17 −6
Original line number Diff line number Diff line
@@ -2268,15 +2268,21 @@ void bond_3ad_handle_link_change(struct slave *slave, char link) 


	port = &(SLAVE_AD_INFO(slave).port);



	// if slave is null, the whole port is not initialized

	/* if slave is null, the whole port is not initialized */

	if (!port->slave) {

		pr_warning("Warning: %s: link status changed for uninitialized port on %s\n",

			   slave->bond->dev->name, slave->dev->name);

		return;

	}



	// on link down we are zeroing duplex and speed since some of the adaptors(ce1000.lan) report full duplex/speed instead of N/A(duplex) / 0(speed)

	// on link up we are forcing recheck on the duplex and speed since some of he adaptors(ce1000.lan) report

	__get_state_machine_lock(port);

	/* on link down we are zeroing duplex and speed since

	 * some of the adaptors(ce1000.lan) report full duplex/speed

	 * instead of N/A(duplex) / 0(speed).

	 *

	 * on link up we are forcing recheck on the duplex and speed since

	 * some of he adaptors(ce1000.lan) report.

	 */

	if (link == BOND_LINK_UP) {

		port->is_enabled = true;

		port->actor_admin_port_key &= ~AD_DUPLEX_KEY_BITS;
@@ -2292,10 +2298,15 @@ void bond_3ad_handle_link_change(struct slave *slave, char link) 
		port->actor_oper_port_key = (port->actor_admin_port_key &=

					     ~AD_SPEED_KEY_BITS);

	}

	//BOND_PRINT_DBG(("Port %d changed link status to %s", port->actor_port_number, ((link == BOND_LINK_UP)?"UP":"DOWN")));

	// there is no need to reselect a new aggregator, just signal the

	// state machines to reinitialize

	pr_debug("Port %d changed link status to %s",

		port->actor_port_number,

		(link == BOND_LINK_UP) ? "UP" : "DOWN");

	/* there is no need to reselect a new aggregator, just signal the

	 * state machines to reinitialize

	 */

	port->sm_vars |= AD_PORT_BEGIN;



	__release_state_machine_lock(port);

}



/*