summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorDjalal Harouni <tixxdz@opendz.org>2016-09-25 11:16:44 +0200
committerDjalal Harouni <tixxdz@opendz.org>2016-09-25 11:16:44 +0200
commit11a30cec2a9b6168b024c06720ad238dd1390794 (patch)
tree65f2d460763832108fe120f09ff38f0699dfc4c1 /src/core
parent9c94d52e0919e4d7999e49b9ba2654a9e2ca4543 (diff)
core:namespace: put paths protected by ProtectKernelTunables= in
Instead of having all these paths everywhere, put the ones that are protected by ProtectKernelTunables= into their own table. This way it is easy to add paths and track which ones are protected.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/namespace.c54
1 files changed, 35 insertions, 19 deletions
diff --git a/src/core/namespace.c b/src/core/namespace.c
index 8de774e6f6..13f6aeba51 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -61,9 +61,23 @@ typedef struct BindMount {
const char *path; /* stack memory, doesn't need to be freed explicitly */
char *chased; /* malloc()ed memory, needs to be freed */
MountMode mode;
- bool ignore;
+ bool ignore; /* Ignore if path does not exist */
} BindMount;
+typedef struct TargetMount {
+ const char *path;
+ MountMode mode;
+ bool ignore; /* Ignore if path does not exist */
+} TargetMount;
+
+/* ProtectKernelTunables= option and the related filesystem APIs */
+static const TargetMount protect_kernel_tunables_table[] = {
+ { "/proc/sys", READONLY, false },
+ { "/proc/sysrq-trigger", READONLY, true },
+ { "/sys", READONLY, false },
+ { "/sys/fs/cgroup", READWRITE, false }, /* READONLY is set by ProtectControlGroups= option */
+};
+
static int append_mounts(BindMount **p, char **strv, MountMode mode) {
char **i;
@@ -89,6 +103,20 @@ static int append_mounts(BindMount **p, char **strv, MountMode mode) {
return 0;
}
+static void append_protect_kernel_tunables(BindMount **p, const char *root_directory) {
+ unsigned int i;
+
+ assert(p);
+
+ for (i = 0; i < ELEMENTSOF(protect_kernel_tunables_table); i++) {
+ const TargetMount *t = &protect_kernel_tunables_table[i];
+ (*p)->path = prefix_roota(root_directory, t->path);
+ (*p)->mode = t->mode;
+ (*p)->ignore = t->ignore;
+ (*p)++;
+ }
+}
+
static int mount_path_compare(const void *a, const void *b) {
const BindMount *p = a, *q = b;
int d;
@@ -514,8 +542,8 @@ int setup_namespace(
strv_length(read_only_paths) +
strv_length(inaccessible_paths) +
private_dev +
- (protect_sysctl ? 3 : 0) +
- (protect_cgroups != protect_sysctl) +
+ (protect_sysctl ? ELEMENTSOF(protect_kernel_tunables_table) : 0) +
+ (protect_cgroups ? 1 : 0) +
(protect_home != PROTECT_HOME_NO || protect_system == PROTECT_SYSTEM_STRICT ? 3 : 0) +
(protect_system == PROTECT_SYSTEM_STRICT ?
(2 + !private_dev + !protect_sysctl) :
@@ -557,24 +585,12 @@ int setup_namespace(
m++;
}
- if (protect_sysctl) {
- m->path = prefix_roota(root_directory, "/proc/sys");
- m->mode = READONLY;
- m++;
-
- m->path = prefix_roota(root_directory, "/proc/sysrq-trigger");
- m->mode = READONLY;
- m->ignore = true; /* Not always compiled into the kernel */
- m++;
+ if (protect_sysctl)
+ append_protect_kernel_tunables(&m, root_directory);
- m->path = prefix_roota(root_directory, "/sys");
- m->mode = READONLY;
- m++;
- }
-
- if (protect_cgroups != protect_sysctl) {
+ if (protect_cgroups) {
m->path = prefix_roota(root_directory, "/sys/fs/cgroup");
- m->mode = protect_cgroups ? READONLY : READWRITE;
+ m->mode = READONLY;
m++;
}