96 lines
3.5 KiB
Diff
96 lines
3.5 KiB
Diff
From 565e3a423b4b225f7ada13c18d5005c8822710a4 Mon Sep 17 00:00:00 2001
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
|
Date: Thu, 18 Nov 2021 20:44:30 +0800
|
|
Subject: [PATCH 137/283] net: hns3: fix hclge_dbg_dump_tm_pg() stack usage
|
|
|
|
mainline inclusion
|
|
from mainline-v5.15-rc4
|
|
commit c894b51e2a23c8c00acb3cea5045c5b70691e790
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EMYT
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c894b51e2a23c8c00acb3cea5045c5b70691e790
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
This function copies strings around between multiple buffers
|
|
including a large on-stack array that causes a build warning
|
|
on 32-bit systems:
|
|
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c: In function 'hclge_dbg_dump_tm_pg':
|
|
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c:782:1: error: the frame size of 1424 bytes is larger than 1400 bytes [-Werror=frame-larger-than=]
|
|
|
|
The function can probably be cleaned up a lot, to go back to
|
|
printing directly into the output buffer, but dynamically allocating
|
|
the structure is a simpler workaround for now.
|
|
|
|
Fixes: 04d96139ddb3 ("net: hns3: refine function hclge_dbg_dump_tm_pri()")
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Reviewed-by: Yongxin Li <liyongxin1@huawei.com>
|
|
Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
.../hisilicon/hns3/hns3pf/hclge_debugfs.c | 28 ++++++++++++++++---
|
|
1 file changed, 24 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
|
|
index 01324fdf397a..6d03af2597b3 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
|
|
@@ -716,9 +716,9 @@ static void hclge_dbg_fill_shaper_content(struct hclge_tm_shaper_para *para,
|
|
sprintf(result[(*index)++], "%6u", para->rate);
|
|
}
|
|
|
|
-static int hclge_dbg_dump_tm_pg(struct hclge_dev *hdev, char *buf, int len)
|
|
+static int __hclge_dbg_dump_tm_pg(struct hclge_dev *hdev, char *data_str,
|
|
+ char *buf, int len)
|
|
{
|
|
- char data_str[ARRAY_SIZE(tm_pg_items)][HCLGE_DBG_DATA_STR_LEN];
|
|
struct hclge_tm_shaper_para c_shaper_para, p_shaper_para;
|
|
char *result[ARRAY_SIZE(tm_pg_items)], *sch_mode_str;
|
|
u8 pg_id, sch_mode, weight, pri_bit_map, i, j;
|
|
@@ -726,8 +726,10 @@ static int hclge_dbg_dump_tm_pg(struct hclge_dev *hdev, char *buf, int len)
|
|
int pos = 0;
|
|
int ret;
|
|
|
|
- for (i = 0; i < ARRAY_SIZE(tm_pg_items); i++)
|
|
- result[i] = &data_str[i][0];
|
|
+ for (i = 0; i < ARRAY_SIZE(tm_pg_items); i++) {
|
|
+ result[i] = data_str;
|
|
+ data_str += HCLGE_DBG_DATA_STR_LEN;
|
|
+ }
|
|
|
|
hclge_dbg_fill_content(content, sizeof(content), tm_pg_items,
|
|
NULL, ARRAY_SIZE(tm_pg_items));
|
|
@@ -778,6 +780,24 @@ static int hclge_dbg_dump_tm_pg(struct hclge_dev *hdev, char *buf, int len)
|
|
return 0;
|
|
}
|
|
|
|
+static int hclge_dbg_dump_tm_pg(struct hclge_dev *hdev, char *buf, int len)
|
|
+{
|
|
+ char *data_str;
|
|
+ int ret;
|
|
+
|
|
+ data_str = kcalloc(ARRAY_SIZE(tm_pg_items),
|
|
+ HCLGE_DBG_DATA_STR_LEN, GFP_KERNEL);
|
|
+
|
|
+ if (!data_str)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ ret = __hclge_dbg_dump_tm_pg(hdev, data_str, buf, len);
|
|
+
|
|
+ kfree(data_str);
|
|
+
|
|
+ return ret;
|
|
+}
|
|
+
|
|
static int hclge_dbg_dump_tm_port(struct hclge_dev *hdev, char *buf, int len)
|
|
{
|
|
struct hclge_tm_shaper_para shaper_para;
|
|
--
|
|
2.34.1
|
|
|