Patch "net: hns3: Fix a loop index error of tqp statistics query" has been added to the 4.15-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
net: hns3: Fix a loop index error of tqp statistics query
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-hns3-fix-a-loop-index-error-of-tqp-statistics-query.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Apr 9 10:16:32 CEST 2018
From: Jian Shen <[email protected]>
Date: Fri, 5 Jan 2018 18:18:13 +0800
Subject: net: hns3: Fix a loop index error of tqp statistics query
From: Jian Shen <[email protected]>
[ Upstream commit 94bfaafac9d2a3c0bcca00d01e38f7597b741799 ]
An error loop index was used while querying statistics data of tqps, which may cause call trace.
--- drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c +5 -5
@@ -455,13 +455,13 @@ static u64 *hns3_get_stats_tqps(struct hstruct 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; } }
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/net-hns3-fix-a-loop-index-error-of-tqp-statistics-query.patch queue-4.15/net-hns3-fix-an-error-macro-definition-of-hns3_tqp_stat.patch queue-4.15/net-hns3-fix-an-error-of-total-drop-packet-statistics.patch