[PATCH] mlxsw: Add return value check for mlxsw_sp_port_get_stats_raw()

Wentao Liang posted 1 patch 10 months, 1 week ago
drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
[PATCH] mlxsw: Add return value check for mlxsw_sp_port_get_stats_raw()
Posted by Wentao Liang 10 months, 1 week ago
Add a check for the return value of mlxsw_sp_port_get_stats_raw()
in __mlxsw_sp_port_get_stats(). If mlxsw_sp_port_get_stats_raw()
returns an error, exit the function to prevent further processing
with potentially invalid data.

Fixes: 614d509aa1e7 ("mlxsw: Move ethtool_ops to spectrum_ethtool.c")
Cc: stable@vger.kernel.org # 5.9+
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
index 2bed8c86b7cf..3f64cdbabfa3 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c
@@ -768,7 +768,9 @@ static void __mlxsw_sp_port_get_stats(struct net_device *dev,
 	err = mlxsw_sp_get_hw_stats_by_group(&hw_stats, &len, grp);
 	if (err)
 		return;
-	mlxsw_sp_port_get_stats_raw(dev, grp, prio, ppcnt_pl);
+	err = mlxsw_sp_port_get_stats_raw(dev, grp, prio, ppcnt_pl);
+	if (err)
+		return;
 	for (i = 0; i < len; i++) {
 		data[data_index + i] = hw_stats[i].getter(ppcnt_pl);
 		if (!hw_stats[i].cells_bytes)
-- 
2.42.0.windows.2
Re: [PATCH] mlxsw: Add return value check for mlxsw_sp_port_get_stats_raw()
Posted by Petr Machata 10 months, 1 week ago
Wentao Liang <vulab@iscas.ac.cn> writes:

> Add a check for the return value of mlxsw_sp_port_get_stats_raw()
> in __mlxsw_sp_port_get_stats(). If mlxsw_sp_port_get_stats_raw()
> returns an error, exit the function to prevent further processing
> with potentially invalid data.
>
> Fixes: 614d509aa1e7 ("mlxsw: Move ethtool_ops to spectrum_ethtool.c")
> Cc: stable@vger.kernel.org # 5.9+
> Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>

Reviewed-by: Petr Machata <petrm@nvidia.com>

Thanks!