87 lines
2.5 KiB
Diff
87 lines
2.5 KiB
Diff
From 7c1c3107fffbfd208acccce8f3c077e10babed3d Mon Sep 17 00:00:00 2001
|
|
From: yangjiaqi <yangjiaqi16@huawei.com>
|
|
Date: Mon, 28 Nov 2022 21:03:19 +0800
|
|
Subject: [PATCH 51/54] remove chmod 751 permission for dirs by engine when
|
|
user-remap enabled
|
|
|
|
---
|
|
.../modules/service/service_container.c | 55 -------------------
|
|
1 file changed, 55 deletions(-)
|
|
|
|
diff --git a/src/daemon/modules/service/service_container.c b/src/daemon/modules/service/service_container.c
|
|
index 2b3c8794..85a8ab52 100644
|
|
--- a/src/daemon/modules/service/service_container.c
|
|
+++ b/src/daemon/modules/service/service_container.c
|
|
@@ -413,54 +413,6 @@ static int mount_host_channel(const host_config_host_channel *host_channel, cons
|
|
return 0;
|
|
}
|
|
|
|
-static int chmod_runtime_bundle_permission(const char *runtime)
|
|
-{
|
|
- int ret = 0;
|
|
- char *bundle_dir = NULL;
|
|
- char *engine_dir = NULL;
|
|
- char *root_dir = NULL;
|
|
-
|
|
- bundle_dir = conf_get_routine_rootdir(runtime);
|
|
- if (bundle_dir == NULL) {
|
|
- ret = -1;
|
|
- goto error_out;
|
|
- }
|
|
-
|
|
- engine_dir = conf_get_engine_rootpath();
|
|
- if (engine_dir == NULL) {
|
|
- ret = -1;
|
|
- goto error_out;
|
|
- }
|
|
-
|
|
- root_dir = conf_get_isulad_rootdir();
|
|
- if (root_dir == NULL) {
|
|
- ret = -1;
|
|
- goto error_out;
|
|
- }
|
|
-
|
|
- ret = chmod(bundle_dir, USER_REMAP_DIRECTORY_MODE);
|
|
- if (ret != 0) {
|
|
- ERROR("Failed to chmod bundle dir '%s' for user remap", bundle_dir);
|
|
- goto error_out;
|
|
- }
|
|
- ret = chmod(engine_dir, USER_REMAP_DIRECTORY_MODE);
|
|
- if (ret != 0) {
|
|
- ERROR("Failed to chmod engine dir '%s' for user remap", engine_dir);
|
|
- goto error_out;
|
|
- }
|
|
- ret = chmod(root_dir, USER_REMAP_DIRECTORY_MODE);
|
|
- if (ret != 0) {
|
|
- ERROR("Failed to chmod root dir '%s' for user remap", root_dir);
|
|
- goto error_out;
|
|
- }
|
|
-
|
|
-error_out:
|
|
- free(bundle_dir);
|
|
- free(engine_dir);
|
|
- free(root_dir);
|
|
- return ret;
|
|
-}
|
|
-
|
|
static int prepare_user_remap_config(const container_t *cont)
|
|
{
|
|
if (cont == NULL) {
|
|
@@ -471,13 +423,6 @@ static int prepare_user_remap_config(const container_t *cont)
|
|
return 0;
|
|
}
|
|
|
|
- if (cont->hostconfig->user_remap != NULL) {
|
|
- if (chmod_runtime_bundle_permission(cont->runtime)) {
|
|
- ERROR("Failed to chmod bundle permission for user remap");
|
|
- return -1;
|
|
- }
|
|
- }
|
|
-
|
|
if (cont->hostconfig->host_channel != NULL) {
|
|
if (mount_host_channel(cont->hostconfig->host_channel, cont->hostconfig->user_remap)) {
|
|
ERROR("Failed to mount host channel");
|
|
--
|
|
2.25.1
|
|
|