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

Commit 60a6531b authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid 



We can't be within an RCU read-side critical section when deleting
VLANs, as underlying drivers might sleep during the hardware operation.
Therefore, replace the RCU critical section with a mutex. This is
consistent with team_vlan_rx_add_vid.

Fixes: 3d249d4c ("net: introduce ethernet teaming device")
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 918f618f

drivers/net/team/team.c

+3 −3
Original line number Diff line number Diff line
@@ -1872,10 +1872,10 @@ static int team_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid) 
	struct team *team = netdev_priv(dev);

	struct team_port *port;



	rcu_read_lock();

	list_for_each_entry_rcu(port, &team->port_list, list)

	mutex_lock(&team->lock);

	list_for_each_entry(port, &team->port_list, list)

		vlan_vid_del(port->dev, proto, vid);

	rcu_read_unlock();

	mutex_unlock(&team->lock);



	return 0;

}