9266dc4f4d
Synchronize code, Modify the review comments to increase the reliability of the code Signed-off-by: veega2022 <zhuweijia@huawei.com> (cherry picked from commit d2a23f9ffed0201385c7864b9cd58312fb395cb6)
71 lines
2.8 KiB
Diff
71 lines
2.8 KiB
Diff
From a5846b63d1f987242bd33a563c15d91dbdcd8273 Mon Sep 17 00:00:00 2001
|
|
From: Junxian Huang <huangjunxian6@hisilicon.com>
|
|
Date: Mon, 5 Aug 2024 19:39:12 +0800
|
|
Subject: [PATCH 03/27] hikptool/roce: Fix the validation check of
|
|
cur_block_num
|
|
|
|
hikp_roce_ext_get_res() will be called multiple times within a loop,
|
|
and each time the remaining space of register array will become less.
|
|
So the cur_block_num from FW should be check against remaining block
|
|
number, but not the total one.
|
|
|
|
Fixes: 8b3b68347165 ("hikptool/roce: Add a common frame for hikptool roce register query")
|
|
Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com>
|
|
---
|
|
net/roce/roce_ext_common/hikp_roce_ext_common.c | 15 ++++++++-------
|
|
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/net/roce/roce_ext_common/hikp_roce_ext_common.c b/net/roce/roce_ext_common/hikp_roce_ext_common.c
|
|
index c22303f..e90720c 100644
|
|
--- a/net/roce/roce_ext_common/hikp_roce_ext_common.c
|
|
+++ b/net/roce/roce_ext_common/hikp_roce_ext_common.c
|
|
@@ -101,7 +101,7 @@ static int hikp_roce_ext_get_res(enum roce_cmd_type cmd_type,
|
|
struct roce_ext_res_param *roce_ext_res;
|
|
struct reg_data *reg = &output->reg;
|
|
struct hikp_cmd_ret *cmd_ret;
|
|
- size_t max_size;
|
|
+ uint32_t remain_block;
|
|
size_t cur_size;
|
|
int ret;
|
|
|
|
@@ -119,29 +119,30 @@ static int hikp_roce_ext_get_res(enum roce_cmd_type cmd_type,
|
|
|
|
roce_ext_res = (struct roce_ext_res_param *)cmd_ret->rsp_data;
|
|
*res_head = roce_ext_res->head;
|
|
- max_size = res_head->total_block_num * sizeof(uint32_t);
|
|
|
|
if (block_id == 0) {
|
|
reg->offset = (uint32_t *)calloc(res_head->total_block_num, sizeof(uint32_t));
|
|
reg->data = (uint32_t *)calloc(res_head->total_block_num, sizeof(uint32_t));
|
|
if ((reg->offset == NULL) || (reg->data == NULL)) {
|
|
printf("hikptool roce_%s alloc log memmory 0x%zx failed!\n",
|
|
- cmd_name, max_size);
|
|
+ cmd_name, res_head->total_block_num * sizeof(uint32_t));
|
|
ret = -ENOMEM;
|
|
hikp_roce_ext_reg_data_free(reg);
|
|
goto get_data_error;
|
|
}
|
|
}
|
|
|
|
- cur_size = res_head->cur_block_num * sizeof(uint32_t);
|
|
- if (!cur_size || cur_size > max_size) {
|
|
- printf("hikptool roce_%s log data copy size error, data size: 0x%zx, max size: 0x%zx\n",
|
|
- cmd_name, cur_size, max_size);
|
|
+ remain_block = res_head->total_block_num - block_id;
|
|
+ if (!res_head->cur_block_num || res_head->cur_block_num > remain_block) {
|
|
+ printf("hikptool roce_%s block size error, cur: %u, total: %u, remain: %u.\n",
|
|
+ cmd_name, res_head->cur_block_num,
|
|
+ res_head->total_block_num, remain_block);
|
|
ret = -EINVAL;
|
|
hikp_roce_ext_reg_data_free(reg);
|
|
goto get_data_error;
|
|
}
|
|
|
|
+ cur_size = res_head->cur_block_num * sizeof(uint32_t);
|
|
memcpy(reg->offset + block_id,
|
|
(uint32_t *)&roce_ext_res->reg_data, cur_size);
|
|
memcpy(reg->data + block_id,
|
|
--
|
|
2.45.0.windows.1
|
|
|