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

!1433 Revise according to the review comments

Browse Source 
Merge pull request !1433 from wangfenging/master
This commit is contained in:
openharmony_ci 2024-09-07 03:02:17 +00:00 committed by Gitee
commit fb4265832e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/sandbox/appspawn_sandbox.c
View File

@ -295,11 +295,12 @@ static int32_t SandboxMountFusePath(const SandboxContext *context, const MountAr
APPSPAWN_CHECK(fd != -1, return -EINVAL,
"open /dev/fuse failed, errno: %{public}d sandbox path %{public}s", errno, args->destinationPath);
char options[OPTIONS_MAX_LEN];
(void)sprintf_s(options, sizeof(options), "fd=%d,"
char options[OPTIONS_MAX_LEN] = {0};
int ret = sprintf_s(options, sizeof(options), "fd=%d,"
"rootmode=40000,user_id=%d,group_id=%d,allow_other,"
"context=\"u:object_r:dlp_fuse_file:s0\","
"fscontext=u:object_r:dlp_fuse_file:s0", fd, info->uid, info->gid);
APPSPAWN_CHECK(ret > 0, return APPSPAWN_ERROR_UTILS_MEM_FAIL, "sprintf options fail");
APPSPAWN_LOGV("Bind mount dlp fuse \n "
"mount arg: '%{public}s' '%{public}s' %{public}x '%{public}s' %{public}s => %{public}s",
@ -309,7 +310,7 @@ static int32_t SandboxMountFusePath(const SandboxContext *context, const MountAr
// To make sure destinationPath exist
CreateSandboxDir(args->destinationPath, FILE_MODE);
MountArg mountArg = {args->originPath, args->destinationPath, args->fsType, args->mountFlags, options, MS_SHARED};
int ret = SandboxMountPath(&mountArg);
ret = SandboxMountPath(&mountArg);
if (ret != 0) {
close(fd);
return -1;
@ -964,7 +965,8 @@ static bool IsADFPermission(AppSpawnSandboxCfg *sandbox, const AppSpawningCtx *p
if (index > 0 && CheckAppPermissionFlagSet(property, index)) {
return true;
}
if (strstr(GetBundleName(property), "com.ohos.dlpmanager") != NULL) {
if (GetBundleName(property) != NULL && strstr(GetBundleName(property), "com.ohos.dlpmanager") != NULL) {
return true;
}
return false;