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

Commit 7f7bf160 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

mlx4: fix use-after-free in mlx4_en_fold_software_stats() 



My recent commit to get more precise rx/tx counters in ndo_get_stats64()
can lead to crashes at device dismantle, as Jesper found out.

We must prevent mlx4_en_fold_software_stats() trying to access
tx/rx rings if they are deleted.

Fix this by adding a test against priv->port_up in
mlx4_en_fold_software_stats()

Calling mlx4_en_fold_software_stats() from mlx4_en_stop_port()
allows us to eventually broadcast the latest/current counters to
rtnetlink monitors.

Fixes: 40931b85 ("mlx4: give precise rx/tx bytes/packets counters")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-and-bisected-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Tested-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
Cc: Tariq Toukan <tariqt@mellanox.com>
Cc: Saeed Mahameed <saeedm@dev.mellanox.co.il>
Acked-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd3ad7d3

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+4 −0
Original line number Diff line number Diff line
@@ -1809,8 +1809,12 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) 


	netif_tx_disable(dev);



	spin_lock_bh(&priv->stats_lock);

	mlx4_en_fold_software_stats(dev);

	/* Set port as not active */

	priv->port_up = false;

	spin_unlock_bh(&priv->stats_lock);



	priv->counter_index = MLX4_SINK_COUNTER_INDEX(mdev->dev);



	/* Promsicuous mode */

drivers/net/ethernet/mellanox/mlx4/en_port.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ void mlx4_en_fold_software_stats(struct net_device *dev) 
	unsigned long packets, bytes;

	int i;



	if (mlx4_is_master(mdev->dev))

	if (!priv->port_up || mlx4_is_master(mdev->dev))

		return;



	packets = 0;