korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 05:54:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

team: move add to port list before port enablement

Browse Source 
team_port_enable() adds port to port_hashlist. Reader sees port
in team_get_port_by_index_rcu() and returns it, but
team_get_first_port_txable_rcu() tries to go through port_list, where the
port is not inserted yet -> NULL pointer dereference.
Fix this by reordering port_list and port_hashlist insertion.
Panic is easily triggeable when txing packets and adding/removing port
in a loop.

Introduced by commit 3d249d4c "net: introduce ethernet teaming device"

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2013-06-08 15:00:54 +02:00 committed by David S. Miller
parent 76c455decb
commit 72df935d98
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/team/team.c
View File

@ -1092,8 +1092,8 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
} }
port->index = -1; port->index = -1;
team_port_enable(team, port);
list_add_tail_rcu(&port->list, &team->port_list); list_add_tail_rcu(&port->list, &team->port_list);
team_port_enable(team, port);
__team_compute_features(team); __team_compute_features(team);
__team_port_change_port_added(port, !!netif_carrier_ok(port_dev)); __team_port_change_port_added(port, !!netif_carrier_ok(port_dev));
__team_options_change_check(team); __team_options_change_check(team);