diff options
| author | Hangbin Liu <liuhangbin@gmail.com> | 2019-04-19 14:31:00 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-16 09:17:14 +0200 |
| commit | 5466bd95f6e335ec3577db222d70ec0d019deadd (patch) | |
| tree | 68d28e18a1d6761dbc41d7da1101452ced00229d /drivers | |
| parent | f37fb00c1c4fe9b791e65f58eb3a2bd17e97cfce (diff) | |
| download | linux-stable-5466bd95f6e335ec3577db222d70ec0d019deadd.tar.gz linux-stable-5466bd95f6e335ec3577db222d70ec0d019deadd.tar.bz2 linux-stable-5466bd95f6e335ec3577db222d70ec0d019deadd.zip | |
team: fix possible recursive locking when add slaves
[ Upstream commit 925b0c841e066b488cc3a60272472b2c56300704 ]
If we add a bond device which is already the master of the team interface,
we will hold the team->lock in team_add_slave() first and then request the
lock in team_set_mac_address() again. The functions are called like:
- team_add_slave()
- team_port_add()
- team_port_enter()
- team_modeop_port_enter()
- __set_port_dev_addr()
- dev_set_mac_address()
- bond_set_mac_address()
- dev_set_mac_address()
- team_set_mac_address
Although team_upper_dev_link() would check the upper devices but it is
called too late. Fix it by adding a checking before processing the slave.
v2: Do not split the string in netdev_err()
Fixes: 3d249d4ca7d0 ("net: introduce ethernet teaming device")
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/team/team.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index eb04b348edf3..1565bb4da4b3 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1137,6 +1137,12 @@ static int team_port_add(struct team *team, struct net_device *port_dev) return -EINVAL; } + if (netdev_has_upper_dev(dev, port_dev)) { + netdev_err(dev, "Device %s is already an upper device of the team interface\n", + portname); + return -EBUSY; + } + if (port_dev->features & NETIF_F_VLAN_CHALLENGED && vlan_uses_dev(dev)) { netdev_err(dev, "Device %s is VLAN challenged and team device has VLAN set up\n", |