p47068915
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!27083 Fix memcpy failure issue in A+M dump 

Merge pull request !27083 from TinaMengtingZhang/cann_api_adapt_bugfix
This commit is contained in:
i-robot 2021-12-02 06:35:12 +00:00 committed by Gitee
parent 0714147223 0580ab94c4
commit d550de466c
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mindspore/ccsrc/debug/dump_data_builder.h
View File

@ -19,6 +19,7 @@
#include <vector>
#include <string>
#include <iostream>
#include <algorithm>
#include "utils/log_adapter.h"
#ifdef ENABLE_D
#include "proto/dump_data.pb.h"
@ -70,9 +71,24 @@ class DumpDataBuilder {
}
auto data_sz = total_sz_ - header_len_offset - header_len;
data_ptr->resize(data_sz);
auto ret = memcpy_s(data_ptr->data(), data_sz, dump_proto_str.c_str() + header_len_offset + header_len, data_sz);
// The security memory copy function 'memcpy_s' has a size limit (SECUREC_MEM_MAX_LEN). If the data size is greater
// than that, it should be cut into segments to copy. Otherwise, memcpy_s will fail.
int ret;
if (data_sz < SECUREC_MEM_MAX_LEN) {
ret = memcpy_s(data_ptr->data(), data_sz, dump_proto_str.c_str() + header_len_offset + header_len, data_sz);
} else {
size_t mem_cpy_len;
for (size_t pos = 0; pos < data_sz; pos += SECUREC_MEM_MAX_LEN) {
mem_cpy_len = std::min(data_sz - pos, SECUREC_MEM_MAX_LEN);
ret = memcpy_s(data_ptr->data() + pos, mem_cpy_len,
dump_proto_str.c_str() + header_len_offset + header_len + pos, mem_cpy_len);
if (ret != 0) {
break;
}
}
}
if (ret != 0) {
MS_LOG(ERROR) << "Failed to get data from Adx";
MS_LOG(ERROR) << "Failed to memcpy: error code (" << ret << ").";
return false;
}
return true;