Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Jian Shen <shenjian15@huawei.com>, Peng Li <lipeng321@huawei.com>,
        "David S . Miller" <davem@davemloft.net>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.15 079/124] net: hns3: Fix a loop index error of
 tqp statistics query
Thread-Topic: [PATCH AUTOSEL for 4.15 079/124] net: hns3: Fix a loop index
 error of tqp statistics query
Thread-Index: AQHTv5m4k0i9lXT1iEiQaPHItQ2Xpw==
Date:   Mon, 19 Mar 2018 15:48:26 +0000
Message-ID: <20180319154645.11350-79-alexander.levin@microsoft.com>
References: <20180319154645.11350-1-alexander.levin@microsoft.com>
In-Reply-To: <20180319154645.11350-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 3a29bf74-0284-4c26-bac5-08d58db0ee7c
X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 15:48:26.9065
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0919
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Jian Shen <shenjian15@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 <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>
---
 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c b/dr=
ivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c
index a21470c72da3..485497a04d7d 100644
--- 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 hnae3_handle *=
handle, u64 *data)
 	struct hnae3_knic_private_info *kinfo =3D &handle->kinfo;
 	struct hns3_enet_ring *ring;
 	u8 *stat;
-	u32 i;
+	int i, j;
=20
 	/* get stats for Tx */
 	for (i =3D 0; i < kinfo->num_tqps; i++) {
 		ring =3D nic_priv->ring_data[i].ring;
-		for (i =3D 0; i < HNS3_TXQ_STATS_COUNT; i++) {
-			stat =3D (u8 *)ring + hns3_txq_stats[i].stats_offset;
+		for (j =3D 0; j < HNS3_TXQ_STATS_COUNT; j++) {
+			stat =3D (u8 *)ring + hns3_txq_stats[j].stats_offset;
 			*data++ =3D *(u64 *)stat;
 		}
 	}
@@ -469,8 +469,8 @@ static u64 *hns3_get_stats_tqps(struct hnae3_handle *ha=
ndle, u64 *data)
 	/* get stats for Rx */
 	for (i =3D 0; i < kinfo->num_tqps; i++) {
 		ring =3D nic_priv->ring_data[i + kinfo->num_tqps].ring;
-		for (i =3D 0; i < HNS3_RXQ_STATS_COUNT; i++) {
-			stat =3D (u8 *)ring + hns3_rxq_stats[i].stats_offset;
+		for (j =3D 0; j < HNS3_RXQ_STATS_COUNT; j++) {
+			stat =3D (u8 *)ring + hns3_rxq_stats[j].stats_offset;
 			*data++ =3D *(u64 *)stat;
 		}
 	}
--=20
2.14.1