Commit 72df935d authored Jun 08, 2013 by Jiri Pirko Committed by David S. Miller Jun 12, 2013

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>

parent 76c455de

drivers/net/team/team.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message