diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2015-03-04 10:36:31 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-18 15:22:27 +0300 |
| commit | fc46dcb4a9c90a52fe279cb2f9d124c8b19fb569 (patch) | |
| tree | ef8d30df8f8a3cff88f122caaa59b7c387f988f2 | |
| parent | 6b3130085888b4f1866d57dc19175bbd283a36a3 (diff) | |
| download | linux-fc46dcb4a9c90a52fe279cb2f9d124c8b19fb569.tar.xz | |
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 <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/team/team.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 44d4d2a5f6c8..14179a6593ef 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1521,11 +1521,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; } |