chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: add API to check if a client has privileges
[elogind.git]
/
src
/
core
/
namespace.c
diff --git
a/src/core/namespace.c
b/src/core/namespace.c
index fcbfd87d4768b1c460d4f246988292acfd80bcfc..fe9537787185c6755f9778593ae5aa393d760e7a 100644
(file)
--- a/
src/core/namespace.c
+++ b/
src/core/namespace.c
@@
-42,6
+42,7
@@
#include "mkdir.h"
#include "dev-setup.h"
#include "def.h"
#include "mkdir.h"
#include "dev-setup.h"
#include "def.h"
+#include "label.h"
typedef enum MountMode {
/* This is ordered by priority! */
typedef enum MountMode {
/* This is ordered by priority! */
@@
-68,6
+69,7
@@
static int append_mounts(BindMount **p, char **strv, MountMode mode) {
STRV_FOREACH(i, strv) {
(*p)->ignore = false;
STRV_FOREACH(i, strv) {
(*p)->ignore = false;
+ (*p)->done = false;
if ((mode == INACCESSIBLE || mode == READONLY || mode == READWRITE) && (*i)[0] == '-') {
(*p)->ignore = true;
if ((mode == INACCESSIBLE || mode == READONLY || mode == READWRITE) && (*i)[0] == '-') {
(*p)->ignore = true;
@@
-122,8
+124,7
@@
static void drop_duplicates(BindMount *m, unsigned *n) {
if (previous && path_equal(f->path, previous->path))
continue;
if (previous && path_equal(f->path, previous->path))
continue;
- t->path = f->path;
- t->mode = f->mode;
+ *t = *f;
previous = t;
previous = t;
@@
-223,7
+224,10
@@
static int mount_dev(BindMount *m) {
goto fail;
}
goto fail;
}
+ label_context_set(d, st.st_mode);
r = mknod(dn, st.st_mode, st.st_rdev);
r = mknod(dn, st.st_mode, st.st_rdev);
+ label_context_clear();
+
if (r < 0) {
r = -errno;
goto fail;
if (r < 0) {
r = -errno;
goto fail;
@@
-280,9
+284,6
@@
static int apply_mount(
switch (m->mode) {
switch (m->mode) {
- case PRIVATE_DEV:
- return mount_dev(m);
-
case INACCESSIBLE:
/* First, get rid of everything that is below if there
case INACCESSIBLE:
/* First, get rid of everything that is below if there
@@
-295,8
+296,9
@@
static int apply_mount(
case READONLY:
case READWRITE:
case READONLY:
case READWRITE:
- what = m->path;
- break;
+ /* Nothing to mount here, we just later toggle the
+ * MS_RDONLY bit for the mount point */
+ return 0;
case PRIVATE_TMP:
what = tmp_dir;
case PRIVATE_TMP:
what = tmp_dir;
@@
-306,6
+308,9
@@
static int apply_mount(
what = var_tmp_dir;
break;
what = var_tmp_dir;
break;
+ case PRIVATE_DEV:
+ return mount_dev(m);
+
default:
assert_not_reached("Unknown mode");
}
default:
assert_not_reached("Unknown mode");
}
@@
-316,7
+321,7
@@
static int apply_mount(
if (r >= 0)
log_debug("Successfully mounted %s to %s", what, m->path);
else if (m->ignore && errno == ENOENT)
if (r >= 0)
log_debug("Successfully mounted %s to %s", what, m->path);
else if (m->ignore && errno == ENOENT)
- r
=
0;
+ r
eturn
0;
return r;
}
return r;
}
@@
-326,14
+331,17
@@
static int make_read_only(BindMount *m) {
assert(m);
assert(m);
- if (m->mode != INACCESSIBLE && m->mode != READONLY)
- return 0;
+ if (IN_SET(m->mode, INACCESSIBLE, READONLY))
+ r = bind_remount_recursive(m->path, true);
+ else if (IN_SET(m->mode, READWRITE, PRIVATE_TMP, PRIVATE_VAR_TMP, PRIVATE_DEV))
+ r = bind_remount_recursive(m->path, false);
+ else
+ r = 0;
- r = mount(NULL, m->path, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY|MS_REC, NULL);
- if (r < 0 && !(m->ignore && errno == ENOENT))
- return -errno;
+ if (m->ignore && r == -ENOENT)
+ return 0;
- return
0
;
+ return
r
;
}
int setup_namespace(
}
int setup_namespace(
@@
-362,12
+370,12
@@
int setup_namespace(
strv_length(read_only_dirs) +
strv_length(inaccessible_dirs) +
private_dev +
strv_length(read_only_dirs) +
strv_length(inaccessible_dirs) +
private_dev +
- (protect_home != PROTECT_HOME_NO ?
2
: 0) +
- (protect_system != PROTECT_SYSTEM_NO ?
1
: 0) +
+ (protect_home != PROTECT_HOME_NO ?
3
: 0) +
+ (protect_system != PROTECT_SYSTEM_NO ?
2
: 0) +
(protect_system == PROTECT_SYSTEM_FULL ? 1 : 0);
if (n > 0) {
(protect_system == PROTECT_SYSTEM_FULL ? 1 : 0);
if (n > 0) {
- m = mounts = (BindMount *) alloca(n * sizeof(BindMount));
+ m = mounts = (BindMount *) alloca
0
(n * sizeof(BindMount));
r = append_mounts(&m, read_write_dirs, READWRITE);
if (r < 0)
return r;
r = append_mounts(&m, read_write_dirs, READWRITE);
if (r < 0)
return r;
@@
-399,13
+407,13
@@
int setup_namespace(
}
if (protect_home != PROTECT_HOME_NO) {
}
if (protect_home != PROTECT_HOME_NO) {
- r = append_mounts(&m, STRV_MAKE("-/home", "-/run/user"), protect_home == PROTECT_HOME_READ_ONLY ? READONLY : INACCESSIBLE);
+ r = append_mounts(&m, STRV_MAKE("-/home", "-/run/user"
, "-/root"
), protect_home == PROTECT_HOME_READ_ONLY ? READONLY : INACCESSIBLE);
if (r < 0)
return r;
}
if (protect_system != PROTECT_SYSTEM_NO) {
if (r < 0)
return r;
}
if (protect_system != PROTECT_SYSTEM_NO) {
- r = append_mounts(&m, protect_system == PROTECT_SYSTEM_FULL ? STRV_MAKE("/usr", "
/etc") : STRV_MAKE("/usr
"), READONLY);
+ r = append_mounts(&m, protect_system == PROTECT_SYSTEM_FULL ? STRV_MAKE("/usr", "
-/boot", "/etc") : STRV_MAKE("/usr", "-/boot
"), READONLY);
if (r < 0)
return r;
}
if (r < 0)
return r;
}