|
 |
771b4bc |
From 7f676da277b85ccba1778ba760646687fa660c9b Mon Sep 17 00:00:00 2001
|
|
|
771b4bc |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
771b4bc |
Date: Fri, 11 May 2012 17:56:09 +0200
|
|
|
771b4bc |
Subject: [PATCH] namespace: make PrivateTmp= apply to both /tmp and /var/tmp
|
|
|
771b4bc |
(cherry picked from commit
|
|
|
771b4bc |
c1d70f7ca5eeeb3850161444028ba227f79df83e)
|
|
|
771b4bc |
|
|
|
771b4bc |
Conflicts:
|
|
|
771b4bc |
TODO
|
|
|
771b4bc |
---
|
|
|
771b4bc |
src/core/namespace.c | 23 ++++++++++++++++-------
|
|
|
771b4bc |
1 file changed, 16 insertions(+), 7 deletions(-)
|
|
|
771b4bc |
|
|
|
771b4bc |
diff --git a/src/core/namespace.c b/src/core/namespace.c
|
|
|
771b4bc |
index a6208e1..d27ffb1 100644
|
|
|
771b4bc |
--- a/src/core/namespace.c
|
|
|
771b4bc |
+++ b/src/core/namespace.c
|
|
|
771b4bc |
@@ -131,7 +131,8 @@ static int apply_mount(Path *p, const char *root_dir, const char *inaccessible_d
|
|
|
771b4bc |
assert(inaccessible_dir);
|
|
|
771b4bc |
assert(private_dir);
|
|
|
771b4bc |
|
|
|
771b4bc |
- if (!(where = strappend(root_dir, p->path)))
|
|
|
771b4bc |
+ where = strappend(root_dir, p->path);
|
|
|
771b4bc |
+ if (!where)
|
|
|
771b4bc |
return -ENOMEM;
|
|
|
771b4bc |
|
|
|
771b4bc |
switch (p->mode) {
|
|
|
771b4bc |
@@ -157,7 +158,8 @@ static int apply_mount(Path *p, const char *root_dir, const char *inaccessible_d
|
|
|
771b4bc |
assert_not_reached("Unknown mode");
|
|
|
771b4bc |
}
|
|
|
771b4bc |
|
|
|
771b4bc |
- if ((r = mount(what, where, NULL, MS_BIND|MS_REC, NULL)) >= 0) {
|
|
|
771b4bc |
+ r = mount(what, where, NULL, MS_BIND|MS_REC, NULL);
|
|
|
771b4bc |
+ if (r >= 0) {
|
|
|
771b4bc |
log_debug("Successfully mounted %s to %s", what, where);
|
|
|
771b4bc |
|
|
|
771b4bc |
/* The bind mount will always inherit the original
|
|
|
771b4bc |
@@ -205,9 +207,10 @@ int setup_namespace(
|
|
|
771b4bc |
strv_length(writable) +
|
|
|
771b4bc |
strv_length(readable) +
|
|
|
771b4bc |
strv_length(inaccessible) +
|
|
|
771b4bc |
- (private_tmp ? 2 : 1);
|
|
|
771b4bc |
+ (private_tmp ? 3 : 1);
|
|
|
771b4bc |
|
|
|
771b4bc |
- if (!(paths = new(Path, n)))
|
|
|
771b4bc |
+ paths = new(Path, n);
|
|
|
771b4bc |
+ if (!paths)
|
|
|
771b4bc |
return -ENOMEM;
|
|
|
771b4bc |
|
|
|
771b4bc |
p = paths;
|
|
|
771b4bc |
@@ -220,6 +223,10 @@ int setup_namespace(
|
|
|
771b4bc |
p->path = "/tmp";
|
|
|
771b4bc |
p->mode = PRIVATE;
|
|
|
771b4bc |
p++;
|
|
|
771b4bc |
+
|
|
|
771b4bc |
+ p->path = "/var/tmp";
|
|
|
771b4bc |
+ p->mode = PRIVATE;
|
|
|
771b4bc |
+ p++;
|
|
|
771b4bc |
}
|
|
|
771b4bc |
|
|
|
771b4bc |
p->path = "/";
|
|
|
771b4bc |
@@ -282,9 +289,11 @@ int setup_namespace(
|
|
|
771b4bc |
goto fail;
|
|
|
771b4bc |
}
|
|
|
771b4bc |
|
|
|
771b4bc |
- for (p = paths; p < paths + n; p++)
|
|
|
771b4bc |
- if ((r = apply_mount(p, root_dir, inaccessible_dir, private_dir, flags)) < 0)
|
|
|
771b4bc |
+ for (p = paths; p < paths + n; p++) {
|
|
|
771b4bc |
+ r = apply_mount(p, root_dir, inaccessible_dir, private_dir, flags);
|
|
|
771b4bc |
+ if (r < 0)
|
|
|
771b4bc |
goto undo_mounts;
|
|
|
771b4bc |
+ }
|
|
|
771b4bc |
|
|
|
771b4bc |
memcpy(old_root_dir, tmp_dir, sizeof(tmp_dir)-1);
|
|
|
771b4bc |
if (!mkdtemp(old_root_dir)) {
|
|
|
771b4bc |
@@ -341,7 +350,7 @@ fail:
|
|
|
771b4bc |
if (remove_tmp)
|
|
|
771b4bc |
rmdir(tmp_dir);
|
|
|
771b4bc |
|
|
|
771b4bc |
- free(paths);
|
|
|
771b4bc |
+ free(paths);
|
|
|
771b4bc |
|
|
|
771b4bc |
return r;
|
|
|
771b4bc |
}
|