Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76c455de authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

team: check return value of team_get_port_by_index_rcu() for NULL 



team_get_port_by_index_rcu() might return NULL due to race between port
removal and skb tx path. Panic is easily triggeable when txing packets
and adding/removing port in a loop.

introduced by commit 3d249d4c "net: introduce ethernet teaming device"
and commit 753f9939 "team: introduce random mode" (for random mode)

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 19a6afb2

drivers/net/team/team_mode_random.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ static bool rnd_transmit(struct team *team, struct sk_buff *skb) 


	port_index = random_N(team->en_port_count);

	port = team_get_port_by_index_rcu(team, port_index);

	if (unlikely(!port))

		goto drop;

	port = team_get_first_port_txable_rcu(team, port);

	if (unlikely(!port))

		goto drop;

drivers/net/team/team_mode_roundrobin.c

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ static bool rr_transmit(struct team *team, struct sk_buff *skb) 


	port_index = rr_priv(team)->sent_packets++ % team->en_port_count;

	port = team_get_port_by_index_rcu(team, port_index);

	if (unlikely(!port))

		goto drop;

	port = team_get_first_port_txable_rcu(team, port);

	if (unlikely(!port))

		goto drop;