提交 8400d7ab 编写于 作者: L laiguizhong

修改Selinux开关

Signed-off-by: Nlaiguizhong <laiguizhong@huawei.com>
上级 3b12098f
...@@ -120,11 +120,8 @@ static int CheckFilePermission(const ParamSecurityLabel *localLabel, const char ...@@ -120,11 +120,8 @@ static int CheckFilePermission(const ParamSecurityLabel *localLabel, const char
static int SelinuxCheckParamPermission(const ParamSecurityLabel *srcLabel, const char *name, uint32_t mode) static int SelinuxCheckParamPermission(const ParamSecurityLabel *srcLabel, const char *name, uint32_t mode)
{ {
int ret = DAC_RESULT_FORBIDED; int ret = DAC_RESULT_FORBIDED;
PARAM_CHECK(g_selinuxSpace.setSelinuxLogCallback != NULL, return ret, "Invalid setSelinuxLogCallback");
PARAM_CHECK(g_selinuxSpace.setParamCheck != NULL, return ret, "Invalid setParamCheck"); PARAM_CHECK(g_selinuxSpace.setParamCheck != NULL, return ret, "Invalid setParamCheck");
PARAM_CHECK(g_selinuxSpace.readParamCheck != NULL, return ret, "Invalid readParamCheck"); PARAM_CHECK(g_selinuxSpace.readParamCheck != NULL, return ret, "Invalid readParamCheck");
// log
g_selinuxSpace.setSelinuxLogCallback();
// check // check
struct ucred uc; struct ucred uc;
...@@ -160,10 +157,6 @@ int RegisterSecuritySelinuxOps(ParamSecurityOps *ops, int isInit) ...@@ -160,10 +157,6 @@ int RegisterSecuritySelinuxOps(ParamSecurityOps *ops, int isInit)
const char *GetSelinuxContent(const char *name) const char *GetSelinuxContent(const char *name)
{ {
PARAM_CHECK(g_selinuxSpace.getParamLabel != NULL, return NULL, "Invalid getParamLabel"); PARAM_CHECK(g_selinuxSpace.getParamLabel != NULL, return NULL, "Invalid getParamLabel");
PARAM_CHECK(g_selinuxSpace.setSelinuxLogCallback != NULL, return NULL, "Invalid setSelinuxLogCallback");
// log
g_selinuxSpace.setSelinuxLogCallback();
return g_selinuxSpace.getParamLabel(name); return g_selinuxSpace.getParamLabel(name);
} }
......
...@@ -36,7 +36,11 @@ ohos_shared_library("libbootchart") { ...@@ -36,7 +36,11 @@ ohos_shared_library("libbootchart") {
external_deps = [ "init:libinit_plugin_engine" ] external_deps = [ "init:libinit_plugin_engine" ]
part_name = "init" part_name = "init"
if (target_cpu == "arm64") {
module_install_dir = "lib64/plugin"
} else {
module_install_dir = "lib/plugin" module_install_dir = "lib/plugin"
}
} }
group("plugin") { group("plugin") {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册