4.15-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Jian Shen <shenjia...@huawei.com>


[ 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 <shenjia...@huawei.com>
Signed-off-by: Peng Li <lipeng...@huawei.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
Signed-off-by: Sasha Levin <alexander.le...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
@@ -455,13 +455,13 @@ static u64 *hns3_get_stats_tqps(struct h
        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 h
        /* 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;
                }
        }


Reply via email to