openharmony/security_security_guard
1
0
Fork 0
mirror of https://gitee.com/openharmony/security_security_guard synced 2024-11-23 14:39:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

buff over flow bug fix

Browse Source 
Signed-off-by: 王毅 <wangyi201@huawei.com>
Change-Id: I372653366e48090778fc1c882c4fc37ae48586ee
This commit is contained in:
王毅 2024-09-02 14:58:40 +08:00
parent 73850cd05f
commit f796772519
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/data_collect/sa/data_collect_manager_service.cpp
View File

@ -496,16 +496,20 @@ bool DataCollectManagerService::WriteRemoteFileToLocal(const SecurityGuard::Secu
SGLOGE("open file fail reason %{public}s", strerror(errno));
return FAILED;
}
char buffer[CFG_FILE_BUFF_SIZE] = {0};
auto buffer = std::make_unique<char []>(CFG_FILE_BUFF_SIZE);
if (buffer == nullptr) {
SGLOGE("new fail");
return NULL_OBJECT;
}
int offset = -1;
while ((offset = read(outputFd, buffer, sizeof(buffer))) > 0) {
while ((offset = read(outputFd, buffer.get(), sizeof(buffer))) > 0) {
if (offset > CFG_FILE_MAX_SIZE || offset == 0) {
close(outputFd);
close(inputFd);
SGLOGE("file is empty or too large, len = %{public}d", offset);
return BAD_PARAM;
}
if (write(inputFd, buffer, offset) < 0) {
if (write(inputFd, buffer.get(), offset) < 0) {
close(inputFd);
close(outputFd);
SGLOGE("write file to the tmp dir failed");
@ -517,6 +521,7 @@ bool DataCollectManagerService::WriteRemoteFileToLocal(const SecurityGuard::Secu
close(outputFd);
return SUCCESS;
}
int32_t DataCollectManagerService::ConfigUpdate(const SecurityGuard::SecurityConfigUpdateInfo &info)
{
SGLOGI("enter ConfigUpdate.");