From: Ido Schimmel Date: Mon, 18 Jan 2016 15:30:22 +0000 (+0200) Subject: team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid X-Git-Tag: v4.1.12-92~150^2~343 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0d939c82f77eb62149cf1a6e1888748c1e272ad4;p=users%2Fjedix%2Flinux-maple.git team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid Orabug: 23330577 [ Upstream commit 60a6531bfe49555581ccd65f66a350cc5693fcde ] 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: 3d249d4ca7d0 ("net: introduce ethernet teaming device") Acked-by: Jiri Pirko Signed-off-by: Ido Schimmel Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 490c963c1eb9a7f5f74446f4b9738c9fb1b8e325) Signed-off-by: Dan Duval --- diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 6928448f6b7f1..2b45d0168c3c1 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1845,10 +1845,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; }