From: Jiri Pirko Date: Wed, 4 Mar 2015 07:36:31 +0000 (+0100) Subject: team: don't traverse port list using rcu in team_set_mac_address X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=67b58fb7d3e7b1e393609e14d95d02a14d7328db;p=people%2Fiwj%2Flinux.git team: don't traverse port list using rcu in team_set_mac_address [ Upstream commit 9215f437b85da339a7dfe3db6e288637406f88b2 ] Currently the list is traversed using rcu variant. That is not correct since dev_set_mac_address can be called which eventually calls rtmsg_ifinfo_build_skb and there, skb allocation can sleep. So fix this by remove the rcu usage here. Fixes: 3d249d4ca7 "net: introduce ethernet teaming device" Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 5d43a7b5fa02..c28e2dafb3f0 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1723,11 +1723,11 @@ static int team_set_mac_address(struct net_device *dev, void *p) if (dev->type == ARPHRD_ETHER && !is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); - 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) if (team->ops.port_change_dev_addr) team->ops.port_change_dev_addr(team, port); - rcu_read_unlock(); + mutex_unlock(&team->lock); return 0; }