Patch "net: hns: fix ethtool_get_strings overflow in hns driver" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
net: hns: fix ethtool_get_strings overflow in hns driver
to the 4.4-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-hns-fix-ethtool_get_strings-overflow-in-hns-driver.patch
and it can be found in the queue-4.4 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 Thu Mar 22 14:57:32 CET 2018
From: Timmy Li <[email protected]>
Date: Tue, 2 May 2017 10:46:52 +0800
Subject: net: hns: fix ethtool_get_strings overflow in hns driver
From: Timmy Li <[email protected]>
[ Upstream commit 412b65d15a7f8a93794653968308fc100f2aa87c ]
hns_get_sset_count() returns HNS_NET_STATS_CNT and the data space allocated is not enough for ethtool_get_strings(), which will cause random memory corruption.
When SLAB and DEBUG_SLAB are both enabled, memory corruptions like the the following can be observed without this patch:
[ 43.115200] Slab corruption (Not tainted): Acpi-ParseExt start=ffff801fb0b69030, len=80 [ 43.115206] Redzone: 0x9f911029d006462/0x5f78745f31657070. [ 43.115208] Last user: [<5f7272655f746b70>](0x5f7272655f746b70) [ 43.115214] 010: 70 70 65 31 5f 74 78 5f 70 6b 74 00 6b 6b 6b 6b ppe1_tx_pkt.kkkk [ 43.115217] 030: 70 70 65 31 5f 74 78 5f 70 6b 74 5f 6f 6b 00 6b ppe1_tx_pkt_ok.k [ 43.115218] Next obj: start=ffff801fb0b69098, len=80 [ 43.115220] Redzone: 0x706d655f6f666966/0x9f911029d74e35b. [ 43.115229] Last user: [<ffff0000084b11b0>](acpi_os_release_object+0x28/0x38) [ 43.115231] 000: 74 79 00 6b 6b 6b 6b 6b 70 70 65 31 5f 74 78 5f ty.kkkkkppe1_tx_ [ 43.115232] 010: 70 6b 74 5f 65 72 72 5f 63 73 75 6d 5f 66 61 69 pkt_err_csum_fai
--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 2 +- drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c +1 -1
@@ -648,7 +648,7 @@ static void hns_gmac_get_strings(u32 strstatic int hns_gmac_get_sset_count (int stringset) { -if (stringset ==ETH_SS_STATS ) +if (stringset ==ETH_SS_STATS || stringset ==ETH_SS_PRIV_FLAGS )return ARRAY_SIZE (g_gmac_stats_string);return 0 ;
drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c +1 -1
@@ -384,7 +384,7 @@ void hns_ppe_update_stats(struct hns_ppeint hns_ppe_get_sset_count (int stringset) { -if (stringset ==ETH_SS_STATS ) +if (stringset ==ETH_SS_STATS || stringset ==ETH_SS_PRIV_FLAGS )return ETH_PPE_STATIC_NUM ;return 0 ; }
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c +1 -1
@@ -807,7 +807,7 @@ void hns_rcb_get_stats(struct hnae_queue*/ int hns_rcb_get_ring_sset_count (int stringset) { -if (stringset ==ETH_SS_STATS ) +if (stringset ==ETH_SS_STATS || stringset ==ETH_SS_PRIV_FLAGS )return HNS_RING_STATIC_REG_NUM ;return 0 ;
drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c +1 -1
@@ -776,7 +776,7 @@ static void hns_xgmac_get_strings(u32 st*/ static int hns_xgmac_get_sset_count (int stringset) { -if (stringset ==ETH_SS_STATS ) +if (stringset ==ETH_SS_STATS || stringset ==ETH_SS_PRIV_FLAGS )return ARRAY_SIZE (g_xgmac_stats_string);return 0 ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/net-hns-fix-ethtool_get_strings-overflow-in-hns-driver.patch