3.5.7.16 -stable review patch. If anyone has any objections, please let me know.
------------------ From: Jiri Pirko <[email protected]> commit 76c455decbbad31de21c727edb184a963f42b40b upstream. 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 3d249d4ca "net: introduce ethernet teaming device" and commit 753f993911b "team: introduce random mode" (for random mode) Signed-off-by: Jiri Pirko <[email protected]> Signed-off-by: David S. Miller <[email protected]> [ luis: backported to 3.5: used davem's backport to 3.4: - adjusted context - dropped changes to team_mode_random.c ] Signed-off-by: Luis Henriques <[email protected]> --- drivers/net/team/team_mode_roundrobin.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/team_mode_roundrobin.c index 6abfbdc..d9a5e45 100644 --- a/drivers/net/team/team_mode_roundrobin.c +++ b/drivers/net/team/team_mode_roundrobin.c @@ -52,6 +52,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 = __get_first_port_up(team, port); if (unlikely(!port)) goto drop; -- 1.8.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
