openharmony/startup_appspawn
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_appspawn synced 2024-11-23 07:00:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1632 sanbox基于nativespawn修复，hnp异常场景资源释放修复

Browse Source 
Merge pull request !1632 from 王达/hotfix/20241029
This commit is contained in:
openharmony_ci 2024-10-30 04:02:32 +00:00 committed by Gitee
commit e9e3d823ef
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/appspawn_server.h
View File

@ -63,6 +63,7 @@ typedef struct AppSpawnContent {
#ifdef USE_ENCAPS
int fdEncaps;
#endif
int sandboxType;
RunMode mode;
#ifndef OHOS_LITE
int32_t preforkFd[2];

11
modules/sandbox/sandbox_manager.c
View File

@ -516,7 +516,7 @@ APPSPAWN_STATIC int PreLoadSandboxCfg(AppSpawnMgr *content)
OH_ListAddTail(&content->extData, &sandbox->extData.node);
// load app sandbox config
LoadAppSandboxConfig(sandbox, content->content.mode);
LoadAppSandboxConfig(sandbox, MODE_FOR_APP_SPAWN);
sandbox->maxPermissionIndex = PermissionRenumber(&sandbox->permissionQueue);
content->content.sandboxNsFlags = 0;
@ -547,6 +547,7 @@ int SpawnBuildSandboxEnv(AppSpawnMgr *content, AppSpawningCtx *property)
ExtDataType type = CheckAppMsgFlagsSet(property, APP_FLAGS_ISOLATED_SANDBOX_TYPE) ? EXT_DATA_ISOLATED_SANDBOX :
EXT_DATA_SANDBOX;
AppSpawnSandboxCfg *appSandbox = GetAppSpawnSandbox(content, type);
content->content.sandboxType = type;
APPSPAWN_CHECK(appSandbox != NULL, return -1, "Failed to get sandbox for %{public}s", GetProcessName(property));
// no sandbox
if (CheckAppMsgFlagsSet(property, APP_FLAGS_NO_SANDBOX)) {
@ -687,6 +688,7 @@ int SpawnPrepareSandboxCfg(AppSpawnMgr *content, AppSpawningCtx *property)
ExtDataType type = CheckAppMsgFlagsSet(property, APP_FLAGS_ISOLATED_SANDBOX_TYPE) ? EXT_DATA_ISOLATED_SANDBOX :
EXT_DATA_SANDBOX;
AppSpawnSandboxCfg *sandbox = GetAppSpawnSandbox(content, type);
content->content.sandboxType = type;
APPSPAWN_CHECK(sandbox != NULL, return -1, "Failed to get sandbox for %{public}s", GetProcessName(property));
int ret = SetSandboxPermissionFlag(sandbox, property);
if (ret != 0) {
@ -706,11 +708,8 @@ APPSPAWN_STATIC int SandboxUnmountPath(const AppSpawnMgr *content, const AppSpaw
APPSPAWN_CHECK_ONLY_EXPER(appInfo != NULL, return -1);
AppSpawnSandboxCfg *sandbox = NULL;
APPSPAWN_LOGV("Sandbox process %{public}s %{public}u exit", appInfo->name, appInfo->uid);
if (content->content.mode == MODE_FOR_NATIVE_SPAWN) {
sandbox = GetAppSpawnSandbox(content, EXT_DATA_ISOLATED_SANDBOX);
} else {
sandbox = GetAppSpawnSandbox(content, EXT_DATA_SANDBOX);
}
sandbox = GetAppSpawnSandbox(content, content->content.sandboxType);
return UnmountDepPaths(sandbox, appInfo->uid);
}

1
service/hnp/installer/src/hnp_installer.c
View File

@ -738,6 +738,7 @@ static int HnpInsatllPre(HapInstallInfo *installInfo)
if ((ret == 0) && (count > 0)) {
data.entries = malloc(sizeof(struct EntryMapEntry) * count);
if (data.entries == NULL) {
free(hnpSignMapInfos);
return HNP_ERRNO_NOMEM;
}
for (i = 0; i < count; i++) {