]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mlxsw: Add return value check for mlxsw_sp_port_get_stats_raw()
authorWentao Liang <vulab@iscas.ac.cn>
Wed, 12 Feb 2025 15:23:11 +0000 (23:23 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Mar 2025 11:47:20 +0000 (12:47 +0100)
commit fee5d688940690cc845937459e340e4e02598e90 upstream.

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>
Link: https://patch.msgid.link/20250212152311.1332-1-vulab@iscas.ac.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c

index 68333ecf6151efe3114b03096b46177eaab1a8bb..9c8883955095030de54171bb43d86d238cc07c18 100644 (file)
@@ -761,7 +761,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)