diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2015-03-04 08:36:31 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-04 22:01:16 +0100 |
| commit | 9215f437b85da339a7dfe3db6e288637406f88b2 (patch) | |
| tree | 52fe871b97f881013ce35c5c420a3a6033b82c7f | |
| parent | net: fec: fix rcv is not last issue when do suspend/resume test (diff) | |
| download | linux-9215f437b85da339a7dfe3db6e288637406f88b2.tar.xz linux-9215f437b85da339a7dfe3db6e288637406f88b2.zip | |
team: don't traverse port list using rcu in team_set_mac_address
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>
| -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 f1ee71e22241..7d394846afc2 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1730,11 +1730,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; } |