diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-06-08 15:00:54 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-12 00:56:27 -0700 |
| commit | 72df935d985c1575ed44ad2c8c653b28147993fa (patch) | |
| tree | f542a207e79b8d9fda9edf98f384d49ca87db126 /drivers | |
| parent | 76c455decbbad31de21c727edb184a963f42b40b (diff) | |
team: move add to port list before port enablement
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/team/team.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index d016a76ad44..b3051052f3a 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1092,8 +1092,8 @@ static int team_port_add(struct team *team, struct net_device *port_dev) } port->index = -1; - team_port_enable(team, port); list_add_tail_rcu(&port->list, &team->port_list); + team_port_enable(team, port); __team_compute_features(team); __team_port_change_port_added(port, !!netif_carrier_ok(port_dev)); __team_options_change_check(team); |