]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: hns3: Fix a loop index error of tqp statistics query
authorJian Shen <shenjian15@huawei.com>
Fri, 5 Jan 2018 10:18:13 +0000 (18:18 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Apr 2018 10:31:09 +0000 (12:31 +0200)
[ Upstream commit 94bfaafac9d2a3c0bcca00d01e38f7597b741799 ]

An error loop index was used while querying statistics data
of tqps, which may cause call trace.

Fixes: 496d03e960ae ("net: hns3: Add Ethtool support to HNS3 driver")
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c

index a21470c72da34c4f9a1d391207c0057ec339cbe4..485497a04d7d96a2fe9894ff8a92e980722a7bbe 100644 (file)
@@ -455,13 +455,13 @@ static u64 *hns3_get_stats_tqps(struct hnae3_handle *handle, u64 *data)
        struct hnae3_knic_private_info *kinfo = &handle->kinfo;
        struct hns3_enet_ring *ring;
        u8 *stat;
-       u32 i;
+       int i, j;
 
        /* get stats for Tx */
        for (i = 0; i < kinfo->num_tqps; i++) {
                ring = nic_priv->ring_data[i].ring;
-               for (i = 0; i < HNS3_TXQ_STATS_COUNT; i++) {
-                       stat = (u8 *)ring + hns3_txq_stats[i].stats_offset;
+               for (j = 0; j < HNS3_TXQ_STATS_COUNT; j++) {
+                       stat = (u8 *)ring + hns3_txq_stats[j].stats_offset;
                        *data++ = *(u64 *)stat;
                }
        }
@@ -469,8 +469,8 @@ static u64 *hns3_get_stats_tqps(struct hnae3_handle *handle, u64 *data)
        /* get stats for Rx */
        for (i = 0; i < kinfo->num_tqps; i++) {
                ring = nic_priv->ring_data[i + kinfo->num_tqps].ring;
-               for (i = 0; i < HNS3_RXQ_STATS_COUNT; i++) {
-                       stat = (u8 *)ring + hns3_rxq_stats[i].stats_offset;
+               for (j = 0; j < HNS3_RXQ_STATS_COUNT; j++) {
+                       stat = (u8 *)ring + hns3_rxq_stats[j].stats_offset;
                        *data++ = *(u64 *)stat;
                }
        }