]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/3.10.72/team-don-t-traverse-port-list-using-rcu-in-team_set_mac_address.patch
4.9-stable patches
[thirdparty/kernel/stable-queue.git] / releases / 3.10.72 / team-don-t-traverse-port-list-using-rcu-in-team_set_mac_address.patch
1 From foo@baz Wed Mar 11 11:37:09 CET 2015
2 From: Jiri Pirko <jiri@resnulli.us>
3 Date: Wed, 4 Mar 2015 08:36:31 +0100
4 Subject: team: don't traverse port list using rcu in team_set_mac_address
5
6 From: Jiri Pirko <jiri@resnulli.us>
7
8 [ Upstream commit 9215f437b85da339a7dfe3db6e288637406f88b2 ]
9
10 Currently the list is traversed using rcu variant. That is not correct
11 since dev_set_mac_address can be called which eventually calls
12 rtmsg_ifinfo_build_skb and there, skb allocation can sleep. So fix this
13 by remove the rcu usage here.
14
15 Fixes: 3d249d4ca7 "net: introduce ethernet teaming device"
16 Signed-off-by: Jiri Pirko <jiri@resnulli.us>
17 Signed-off-by: David S. Miller <davem@davemloft.net>
18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
19 ---
20 drivers/net/team/team.c | 6 +++---
21 1 file changed, 3 insertions(+), 3 deletions(-)
22
23 --- a/drivers/net/team/team.c
24 +++ b/drivers/net/team/team.c
25 @@ -1521,11 +1521,11 @@ static int team_set_mac_address(struct n
26 if (dev->type == ARPHRD_ETHER && !is_valid_ether_addr(addr->sa_data))
27 return -EADDRNOTAVAIL;
28 memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
29 - rcu_read_lock();
30 - list_for_each_entry_rcu(port, &team->port_list, list)
31 + mutex_lock(&team->lock);
32 + list_for_each_entry(port, &team->port_list, list)
33 if (team->ops.port_change_dev_addr)
34 team->ops.port_change_dev_addr(team, port);
35 - rcu_read_unlock();
36 + mutex_unlock(&team->lock);
37 return 0;
38 }
39