Skip to content

Commit 0ae9cfc

Browse files
zlatistivkuba-moo
authored andcommitted
team: Move team device type change at the end of team_port_add
Attempting to add a port device that is already up will expectedly fail, but not before modifying the team device header_ops. In the case of the syzbot reproducer the gre0 device is already in state UP when it attempts to add it as a port device of team0, this fails but before that header_ops->create of team0 is changed from eth_header to ipgre_header in the call to team_dev_type_check_change. Later when we end up in ipgre_header() struct ip_tunnel* points to nonsense as the private data of the device still holds a struct team. Example sequence of iproute2 commands to reproduce the hang/BUG(): ip link add dev team0 type team ip link add dev gre0 type gre ip link set dev gre0 up ip link set dev gre0 master team0 ip link set dev team0 up ping -I team0 1.1.1.1 Move team_dev_type_check_change down where all other checks have passed as it changes the dev type with no way to restore it in case one of the checks that follow it fail. Also make sure to preserve the origial mtu assignment: - If port_dev is not the same type as dev, dev takes mtu from port_dev - If port_dev is the same type as dev, port_dev takes mtu from dev This is done by adding a conditional before the call to dev_set_mtu to prevent it from assigning port_dev->mtu = dev->mtu and instead letting team_dev_type_check_change assign dev->mtu = port_dev->mtu. The conditional is needed because the patch moves the call to team_dev_type_check_change past dev_set_mtu. Testing: - team device driver in-tree selftests - Add/remove various devices as slaves of team device - syzbot Reported-by: syzbot+a2a3b519de727b0f7903@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=a2a3b519de727b0f7903 Fixes: 1d76efe ("team: add support for non-ethernet devices") Signed-off-by: Nikola Z. Ivanov <zlatistiv@gmail.com> Reviewed-by: Jiri Pirko <jiri@nvidia.com> Link: https://patch.msgid.link/20251122002027.695151-1-zlatistiv@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent d2099d9 commit 0ae9cfc

1 file changed

Lines changed: 15 additions & 8 deletions

File tree

drivers/net/team/team_core.c

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,10 +1191,6 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
11911191
return -EPERM;
11921192
}
11931193

1194-
err = team_dev_type_check_change(dev, port_dev);
1195-
if (err)
1196-
return err;
1197-
11981194
if (port_dev->flags & IFF_UP) {
11991195
NL_SET_ERR_MSG(extack, "Device is up. Set it down before adding it as a team port");
12001196
netdev_err(dev, "Device %s is up. Set it down before adding it as a team port\n",
@@ -1212,10 +1208,16 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
12121208
INIT_LIST_HEAD(&port->qom_list);
12131209

12141210
port->orig.mtu = port_dev->mtu;
1215-
err = dev_set_mtu(port_dev, dev->mtu);
1216-
if (err) {
1217-
netdev_dbg(dev, "Error %d calling dev_set_mtu\n", err);
1218-
goto err_set_mtu;
1211+
/*
1212+
* MTU assignment will be handled in team_dev_type_check_change
1213+
* if dev and port_dev are of different types
1214+
*/
1215+
if (dev->type == port_dev->type) {
1216+
err = dev_set_mtu(port_dev, dev->mtu);
1217+
if (err) {
1218+
netdev_dbg(dev, "Error %d calling dev_set_mtu\n", err);
1219+
goto err_set_mtu;
1220+
}
12191221
}
12201222

12211223
memcpy(port->orig.dev_addr, port_dev->dev_addr, port_dev->addr_len);
@@ -1290,6 +1292,10 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
12901292
}
12911293
}
12921294

1295+
err = team_dev_type_check_change(dev, port_dev);
1296+
if (err)
1297+
goto err_set_dev_type;
1298+
12931299
if (dev->flags & IFF_UP) {
12941300
netif_addr_lock_bh(dev);
12951301
dev_uc_sync_multiple(port_dev, dev);
@@ -1308,6 +1314,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
13081314

13091315
return 0;
13101316

1317+
err_set_dev_type:
13111318
err_set_slave_promisc:
13121319
__team_option_inst_del_port(team, port);
13131320

0 commit comments

Comments
 (0)