openharmony/startup_init
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_init synced 2024-11-27 02:10:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Description:memory free fix

Browse Source 
Feature or Bugfix:Bugfix
Binary Source: No
Signed-off-by: zl_zl <zhenglei28@huawei.com>
This commit is contained in:
z00500798 2024-08-06 19:31:41 +08:00
parent cf42365166
commit e72ee0fd6a
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
interfaces/innerkits/fs_manager/erofs_overlay/erofs_mount_overlay.c
View File

@ -215,22 +215,27 @@ static int GetMapperAddr(const char *dev, uint64_t *start, uint64_t *length)
return 0;
}
static void ConstructLinearTarget(DmVerityTarget *target, const char *dev, uint64_t mapStart, uint64_t mapLength)
static int ConstructLinearTarget(DmVerityTarget *target, const char *dev, uint64_t mapStart, uint64_t mapLength)
{
if (target == NULL || dev == NULL) {
return;
return -1;
}
target->start = 0;
target->length = mapLength / SECTOR_SIZE;
target->paras = calloc(1, MAX_BUFFER_LEN);
if (target->paras == NULL) {
BEGET_LOGE("Failed to calloc target paras");
return -1;
}
if (snprintf_s(target->paras, MAX_BUFFER_LEN, MAX_BUFFER_LEN - 1, "%s %lld", dev, mapStart / SECTOR_SIZE) < 0) {
BEGET_LOGE("Failed to copy target paras.");
return;
BEGET_LOGE("Failed to copy target paras.");
return -1;
}
target->paras_len = strlen(target->paras);
BEGET_LOGI("dev [%s], linearparas [%s], length [%s]", dev, target->paras, target->paras_len);
return 0;
}
static void DestoryLinearTarget(DmVerityTarget *target)
@ -264,14 +269,22 @@ static int GetOverlayDevice(FstabItem *item, char *devRofs, const uint32_t devRo
DmVerityTarget dmRofsTarget = {0};
DmVerityTarget dmExt4Target = {0};
ConstructLinearTarget(&dmRofsTarget, item->deviceName, 0, mapStart);
int rc = FsDmCreateLinearDevice(nameRofs, devRofs, devRofsLen, &dmRofsTarget);
int rc = ConstructLinearTarget(&dmRofsTarget, item->deviceName, 0, mapStart);
if (rc != 0) {
BEGET_LOGE("fs create rofs linear device failed, dev is [%s]", item->deviceName);
BEGET_LOGE("fs construct erofs linear target failed, dev is [%s]", item->deviceName);
goto exit;
}
rc = FsDmCreateLinearDevice(nameRofs, devRofs, devRofsLen, &dmRofsTarget);
if (rc != 0) {
BEGET_LOGE("fs create erofs linear device failed, dev is [%s]", item->deviceName);
goto exit;
}
ConstructLinearTarget(&dmExt4Target, item->deviceName, mapStart, mapLength);
rc = ConstructLinearTarget(&dmExt4Target, item->deviceName, mapStart, mapLength);
if (rc != 0) {
BEGET_LOGE("fs construct ext4 linear target failed, dev is [%s]", item->deviceName);
goto exit;
}
rc = FsDmCreateLinearDevice(nameExt4, devExt4, devExt4Len, &dmExt4Target);
if (rc != 0) {
BEGET_LOGE("fs create ext4 linear device failed, dev is [%s]", item->deviceName);

1
services/loopevent/task/le_streamtask.c
View File

@ -55,6 +55,7 @@ static LE_STATUS HandleRecvMsg_(const LoopHandle loopHandle,
{
LE_STATUS status = LE_SUCCESS;
LE_Buffer *buffer = CreateBuffer(LOOP_DEFAULT_BUFFER);
LE_CHECK(buffer != NULL, return LE_NO_MEMORY, "Failed to create buffer");
int readLen = 0;
while (1) {
if (handleRecvMsg != NULL) {

3
services/param/linux/param_request.c
View File

@ -236,7 +236,8 @@ int SystemSaveParameters(void)
PARAM_CHECK(ret == 0, free(request);
return -1, "SystemSaveParameters failed! the errNum is:-1");
int fd = GetClientSocket(DEFAULT_PARAM_WAIT_TIMEOUT);
PARAM_CHECK(fd >= 0, return fd, "SystemSaveParameters failed! the errNum is:%d", ret);
PARAM_CHECK(fd >= 0, free(request);
return fd, "SystemSaveParameters failed! the errNum is:%d", ret);
request->msgSize = offset + sizeof(ParamMessage);
request->id.msgId = ATOMIC_SYNC_ADD_AND_FETCH(&g_requestId, 1, MEMORY_ORDER_RELAXED);
ret = StartRequest(fd, request, DEFAULT_PARAM_WAIT_TIMEOUT);