Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Startup Init Lite
提交
067bd2cf
S
Startup Init Lite
项目概览
OpenHarmony
/
Startup Init Lite
12 个月 前同步成功
通知
3
Star
37
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
Startup Init Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
067bd2cf
编写于
5月 26, 2023
作者:
O
openharmony_ci
提交者:
Gitee
5月 26, 2023
浏览文件
操作
浏览文件
下载
差异文件
!1969 扩大dac的空间
Merge pull request !1969 from cheng_jinsong/initlock
上级
0eefce2c
a47d18bb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
12 deletion
+10
-12
services/param/base/param_base.c
services/param/base/param_base.c
+5
-12
services/param/include/param_osadp.h
services/param/include/param_osadp.h
+5
-0
未找到文件。
services/param/base/param_base.c
浏览文件 @
067bd2cf
...
...
@@ -165,7 +165,7 @@ INIT_INNER_API int InitParamWorkSpace(int onlyRead, const PARAM_WORKSPACE_OPS *o
ret
=
AddWorkSpace
(
WORKSPACE_NAME_DEF_SELINUX
,
WORKSPACE_INDEX_BASE
,
onlyRead
,
PARAM_WORKSPACE_DEF
);
PARAM_CHECK
(
ret
==
0
,
return
-
1
,
"Failed to add default workspace"
);
// add dac workspace
ret
=
AddWorkSpace
(
WORKSPACE_NAME_DAC
,
WORKSPACE_INDEX_DAC
,
onlyRead
,
PARAM_WORKSPACE_
SMALL
);
ret
=
AddWorkSpace
(
WORKSPACE_NAME_DAC
,
WORKSPACE_INDEX_DAC
,
onlyRead
,
PARAM_WORKSPACE_
DAC
);
PARAM_CHECK
(
ret
==
0
,
return
-
1
,
"Failed to add dac workspace"
);
#endif
if
(
onlyRead
==
0
)
{
...
...
@@ -187,9 +187,9 @@ INIT_INNER_API int InitParamWorkSpace(int onlyRead, const PARAM_WORKSPACE_OPS *o
}
else
{
ret
=
OpenWorkSpace
(
WORKSPACE_INDEX_DAC
,
onlyRead
);
PARAM_CHECK
(
ret
==
0
,
return
-
1
,
"Failed to open dac workspace"
);
#ifdef PARAM_SUPPORT_SELINUX // load security label and create workspace
ret
=
OpenWorkSpace
(
WORKSPACE_INDEX_BASE
,
onlyRead
);
PARAM_CHECK
(
ret
==
0
,
return
-
1
,
"Failed to open default workspace"
);
#ifdef PARAM_SUPPORT_SELINUX // load security label and create workspace
ParamSecurityOps
*
ops
=
GetParamSecurityOps
(
PARAM_SECURITY_SELINUX
);
if
(
ops
!=
NULL
&&
ops
->
securityGetLabel
!=
NULL
)
{
ops
->
securityGetLabel
(
NULL
);
...
...
@@ -461,16 +461,9 @@ static int GetParamLabelInfo(const char *name, ParamLabelIndex *labelIndex, Para
PARAM_CHECK
(
dacSpace
!=
NULL
&&
dacSpace
->
area
!=
NULL
,
return
DAC_RESULT_FORBIDED
,
"Invalid workSpace for %s"
,
name
);
*
node
=
BaseFindTrieNode
(
dacSpace
,
name
,
strlen
(
name
),
&
labelIndex
->
dacLabelIndex
);
ParamSecurityNode
*
securityNode
=
(
ParamSecurityNode
*
)
GetTrieNode
(
dacSpace
,
labelIndex
->
dacLabelIndex
);
if
((
securityNode
==
NULL
)
||
(
securityNode
->
selinuxIndex
==
0
)
||
(
securityNode
->
selinuxIndex
==
INVALID_SELINUX_INDEX
))
{
labelIndex
->
workspace
=
GetWorkSpaceByName
(
name
);
PARAM_CHECK
(
labelIndex
->
workspace
!=
NULL
,
return
DAC_RESULT_FORBIDED
,
"Invalid workSpace for %s"
,
name
);
}
else
if
(
securityNode
->
selinuxIndex
<
g_paramWorkSpace
.
maxLabelIndex
)
{
labelIndex
->
workspace
=
g_paramWorkSpace
.
workSpace
[
securityNode
->
selinuxIndex
];
PARAM_CHECK
(
labelIndex
->
workspace
!=
NULL
,
return
DAC_RESULT_FORBIDED
,
"Invalid workSpace for %s %d"
,
name
,
securityNode
->
selinuxIndex
);
}
labelIndex
->
workspace
=
GetWorkSpaceByName
(
name
);
PARAM_CHECK
(
labelIndex
->
workspace
!=
NULL
,
return
DAC_RESULT_FORBIDED
,
"Invalid workSpace for %s"
,
name
);
labelIndex
->
selinuxLabelIndex
=
labelIndex
->
workspace
->
spaceIndex
;
return
0
;
}
...
...
services/param/include/param_osadp.h
浏览文件 @
067bd2cf
...
...
@@ -91,10 +91,15 @@ extern "C" {
#define PARAM_WORKSPACE_MAX (80 * 1024)
#define PARAM_WORKSPACE_SMALL (1024 * 10)
#define PARAM_WORKSPACE_DEF (1024 * 30)
#define PARAM_WORKSPACE_DAC (1024 * 20)
#endif // __LITEOS_A__
#endif // __LITEOS_M__
#endif // STARTUP_INIT_TEST
#ifndef PARAM_WORKSPACE_DAC
#define PARAM_WORKSPACE_DAC PARAM_WORKSPACE_SMALL
#endif
// support futex
#ifndef __NR_futex
#define PARAM_NR_FUTEX 202
/* syscall number */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录