X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnspawn%2Fnspawn.c;h=244ebb83425faa00010c2cb104fe80c965284ca1;hb=7cd28a8a2fdf01293b0c07681a5f36f557fe51b4;hp=c46f63ba29a4d7ab89bf9dec972e010db18e60e2;hpb=6b2d0e85dce8762d6d65a97c7c7ae5e81806fe3e;p=elogind.git diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index c46f63ba2..244ebb834 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -284,9 +284,9 @@ static int mount_all(const char *dest) { unsigned k; int r = 0; - char _cleanup_free_ *where = NULL; for (k = 0; k < ELEMENTSOF(mount_table); k++) { + char _cleanup_free_ *where = NULL; int t; if (asprintf(&where, "%s/%s", dest, mount_table[k].where) < 0) { @@ -332,28 +332,61 @@ static int mount_all(const char *dest) { } static int setup_timezone(const char *dest) { - char *where; + _cleanup_free_ char *where = NULL, *p = NULL, *q = NULL, *check = NULL, *what = NULL; + char *z, *y; + int r; assert(dest); /* Fix the timezone, if possible */ + r = readlink_malloc("/etc/localtime", &p); + if (r < 0) { + log_warning("/etc/localtime is not a symlink, not updating container timezone."); + return 0; + } + + z = path_startswith(p, "../usr/share/zoneinfo/"); + if (!z) + z = path_startswith(p, "/usr/share/zoneinfo/"); + if (!z) { + log_warning("/etc/localtime does not point into /usr/share/zoneinfo/, not updating container timezone."); + return 0; + } + where = strappend(dest, "/etc/localtime"); if (!where) return log_oom(); - if (mount("/etc/localtime", where, "bind", MS_BIND, NULL) >= 0) - mount("/etc/localtime", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); + r = readlink_malloc(where, &q); + if (r >= 0) { + y = path_startswith(q, "../usr/share/zoneinfo/"); + if (!y) + y = path_startswith(q, "/usr/share/zoneinfo/"); - free(where); - where = strappend(dest, "/etc/timezone"); - if (!where) + /* Already pointing to the right place? Then do nothing .. */ + if (y && streq(y, z)) + return 0; + } + + check = strjoin(dest, "/usr/share/zoneinfo/", z, NULL); + if (!check) return log_oom(); - if (mount("/etc/timezone", where, "bind", MS_BIND, NULL) >= 0) - mount("/etc/timezone", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); + if (access(check, F_OK) < 0) { + log_warning("Timezone %s does not exist in container, not updating container timezone.", z); + return 0; + } - free(where); + what = strappend("../usr/share/zoneinfo/", z); + if (!what) + return log_oom(); + + unlink(where); + if (symlink(what, where) < 0) { + log_error("Failed to correct timezone of container: %m"); + return 0; + } return 0; } @@ -371,6 +404,8 @@ static int setup_resolv_conf(const char *dest) { if (!where) return log_oom(); + /* We don't really care for the results of this really. If it + * fails, it fails, but meh... */ if (mount("/etc/resolv.conf", where, "bind", MS_BIND, NULL) >= 0) mount("/etc/resolv.conf", where, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); @@ -380,7 +415,7 @@ static int setup_resolv_conf(const char *dest) { } static int setup_boot_id(const char *dest) { - char *from = NULL, *to = NULL; + char _cleanup_free_ *from = NULL, *to = NULL; sd_id128_t rnd; char as_uuid[37]; int r; @@ -391,21 +426,14 @@ static int setup_boot_id(const char *dest) { * the container gets a new one */ from = strappend(dest, "/dev/proc-sys-kernel-random-boot-id"); - if (!from) { - r = log_oom(); - goto finish; - } - to = strappend(dest, "/proc/sys/kernel/random/boot_id"); - if (!to) { - r = log_oom(); - goto finish; - } + if (!from || !to) + return log_oom(); r = sd_id128_randomize(&rnd); if (r < 0) { log_error("Failed to generate random boot id: %s", strerror(-r)); - goto finish; + return r; } snprintf(as_uuid, sizeof(as_uuid), @@ -416,7 +444,7 @@ static int setup_boot_id(const char *dest) { r = write_one_line_file(from, as_uuid); if (r < 0) { log_error("Failed to write boot id: %s", strerror(-r)); - goto finish; + return r; } if (mount(from, to, "bind", MS_BIND, NULL) < 0) { @@ -426,11 +454,6 @@ static int setup_boot_id(const char *dest) { mount(from, to, "bind", MS_BIND|MS_REMOUNT|MS_RDONLY, NULL); unlink(from); - -finish: - free(from); - free(to); - return r; } @@ -447,7 +470,7 @@ static int copy_devnodes(const char *dest) { const char *d; int r = 0; - mode_t u; + mode_t _cleanup_umask_ u; assert(dest); @@ -455,18 +478,13 @@ static int copy_devnodes(const char *dest) { NULSTR_FOREACH(d, devnodes) { struct stat st; - char *from = NULL, *to = NULL; + char _cleanup_free_ *from = NULL, *to = NULL; asprintf(&from, "/dev/%s", d); asprintf(&to, "%s/dev/%s", dest, d); if (!from || !to) { - log_error("Failed to allocate devnode path"); - - free(from); - free(to); - - from = to = NULL; + log_oom(); if (r == 0) r = -ENOMEM; @@ -484,7 +502,7 @@ static int copy_devnodes(const char *dest) { } else if (!S_ISCHR(st.st_mode) && !S_ISBLK(st.st_mode)) { - log_error("%s is not a char or block device, cannot copy.", from); + log_error("%s is not a char or block device, cannot copy", from); if (r == 0) r = -EIO; @@ -494,21 +512,16 @@ static int copy_devnodes(const char *dest) { if (r == 0) r = -errno; } - - free(from); - free(to); } - umask(u); - return r; } static int setup_dev_console(const char *dest, const char *console) { struct stat st; - char *to = NULL; + char _cleanup_free_ *to = NULL; int r; - mode_t u; + mode_t _cleanup_umask_ u; assert(dest); assert(console); @@ -517,25 +530,21 @@ static int setup_dev_console(const char *dest, const char *console) { if (stat(console, &st) < 0) { log_error("Failed to stat %s: %m", console); - r = -errno; - goto finish; + return -errno; } else if (!S_ISCHR(st.st_mode)) { - log_error("/dev/console is not a char device."); - r = -EIO; - goto finish; + log_error("/dev/console is not a char device"); + return -EIO; } r = chmod_and_chown(console, 0600, 0, 0); if (r < 0) { log_error("Failed to correct access mode for TTY: %s", strerror(-r)); - goto finish; + return r; } - if (asprintf(&to, "%s/dev/console", dest) < 0) { - r = log_oom(); - goto finish; - } + if (asprintf(&to, "%s/dev/console", dest) < 0) + return log_oom(); /* We need to bind mount the right tty to /dev/console since * ptys can only exist on pts file systems. To have something @@ -546,27 +555,21 @@ static int setup_dev_console(const char *dest, const char *console) { if (mknod(to, (st.st_mode & ~07777) | 0600, st.st_rdev) < 0) { log_error("mknod() for /dev/console failed: %m"); - r = -errno; - goto finish; + return -errno; } if (mount(console, to, "bind", MS_BIND, NULL) < 0) { log_error("Bind mount for /dev/console failed: %m"); - r = -errno; - goto finish; + return -errno; } -finish: - free(to); - umask(u); - - return r; + return 0; } static int setup_kmsg(const char *dest, int kmsg_socket) { - char *from = NULL, *to = NULL; + char _cleanup_free_ *from = NULL, *to = NULL; int r, fd, k; - mode_t u; + mode_t _cleanup_umask_ u; union { struct cmsghdr cmsghdr; uint8_t buf[CMSG_SPACE(sizeof(int))]; @@ -586,39 +589,30 @@ static int setup_kmsg(const char *dest, int kmsg_socket) { * that writing blocks when nothing is reading. In order to * avoid any problems with containers deadlocking due to this * we simply make /dev/kmsg unavailable to the container. */ - if (asprintf(&from, "%s/dev/kmsg", dest) < 0) { - r = log_oom(); - goto finish; - } - - if (asprintf(&to, "%s/proc/kmsg", dest) < 0) { - r = log_oom(); - goto finish; - } + if (asprintf(&from, "%s/dev/kmsg", dest) < 0 || + asprintf(&to, "%s/proc/kmsg", dest) < 0) + return log_oom(); if (mkfifo(from, 0600) < 0) { log_error("mkfifo() for /dev/kmsg failed: %m"); - r = -errno; - goto finish; + return -errno; } r = chmod_and_chown(from, 0600, 0, 0); if (r < 0) { log_error("Failed to correct access mode for /dev/kmsg: %s", strerror(-r)); - goto finish; + return r; } if (mount(from, to, "bind", MS_BIND, NULL) < 0) { log_error("Bind mount for /proc/kmsg failed: %m"); - r = -errno; - goto finish; + return -errno; } fd = open(from, O_RDWR|O_NDELAY|O_CLOEXEC); if (fd < 0) { log_error("Failed to open fifo: %m"); - r = -errno; - goto finish; + return -errno; } zero(mh); @@ -642,19 +636,12 @@ static int setup_kmsg(const char *dest, int kmsg_socket) { if (k < 0) { log_error("Failed to send FIFO fd: %m"); - r = -errno; - goto finish; + return -errno; } /* And now make the FIFO unavailable as /dev/kmsg... */ unlink(from); - -finish: - free(from); - free(to); - umask(u); - - return r; + return 0; } static int setup_hostname(void) { @@ -681,58 +668,58 @@ static int setup_hostname(void) { static int setup_journal(const char *directory) { sd_id128_t machine_id; - char *p = NULL, *b = NULL, *l, *q = NULL, *d = NULL; + char _cleanup_free_ *p = NULL, *b = NULL, *q = NULL, *d = NULL; + char *id; int r; if (arg_link_journal == LINK_NO) return 0; p = strappend(directory, "/etc/machine-id"); - if (!p) { - r = log_oom(); - goto finish; - } + if (!p) + return log_oom(); r = read_one_line_file(p, &b); - if (r == -ENOENT && arg_link_journal == LINK_AUTO) { - r = 0; - goto finish; - } else if (r < 0) { - log_error("Failed to read machine ID: %s", strerror(-r)); + if (r == -ENOENT && arg_link_journal == LINK_AUTO) + return 0; + else if (r < 0) { + log_error("Failed to read machine ID from %s: %s", p, strerror(-r)); return r; } - l = strstrip(b); - if (isempty(l) && arg_link_journal == LINK_AUTO) { - r = 0; - goto finish; - } + id = strstrip(b); + if (isempty(id) && arg_link_journal == LINK_AUTO) + return 0; - /* Verify validaty */ - r = sd_id128_from_string(l, &machine_id); + /* Verify validity */ + r = sd_id128_from_string(id, &machine_id); if (r < 0) { - log_error("Failed to parse machine ID: %s", strerror(-r)); - goto finish; + log_error("Failed to parse machine ID from %s: %s", p, strerror(-r)); + return r; } free(p); - p = strappend("/var/log/journal/", l); - q = strjoin(directory, "/var/log/journal/", l, NULL); - if (!p || !q) { - r = log_oom(); - goto finish; + p = strappend("/var/log/journal/", id); + q = strjoin(directory, "/var/log/journal/", id, NULL); + if (!p || !q) + return log_oom(); + + if (path_is_mount_point(p, false) > 0) { + if (arg_link_journal != LINK_AUTO) { + log_error("%s: already a mount point, refusing to use for journal", p); + return -EEXIST; + } + + return 0; } - if (path_is_mount_point(p, false) > 0 || - path_is_mount_point(q, false) > 0) { + if (path_is_mount_point(q, false) > 0) { if (arg_link_journal != LINK_AUTO) { - log_error("Journal already a mount point, refusing."); - r = -EEXIST; - goto finish; + log_error("%s: already a mount point, refusing to use for journal", q); + return -EEXIST; } - r = 0; - goto finish; + return 0; } r = readlink_and_make_absolute(p, &d); @@ -741,89 +728,74 @@ static int setup_journal(const char *directory) { arg_link_journal == LINK_AUTO) && path_equal(d, q)) { - mkdir_p(q, 0755); - - r = 0; - goto finish; + r = mkdir_p(q, 0755); + if (r < 0) + log_warning("failed to create directory %s: %m", q); + return 0; } if (unlink(p) < 0) { log_error("Failed to remove symlink %s: %m", p); - r = -errno; - goto finish; + return -errno; } } else if (r == -EINVAL) { if (arg_link_journal == LINK_GUEST && rmdir(p) < 0) { - if (errno == ENOTDIR) - log_error("%s already exists and is neither symlink nor directory.", p); - else { + if (errno == ENOTDIR) { + log_error("%s already exists and is neither a symlink nor a directory", p); + return r; + } else { log_error("Failed to remove %s: %m", p); - r = -errno; + return -errno; } - - goto finish; } } else if (r != -ENOENT) { log_error("readlink(%s) failed: %m", p); - goto finish; + return r; } if (arg_link_journal == LINK_GUEST) { if (symlink(q, p) < 0) { log_error("Failed to symlink %s to %s: %m", q, p); - r = -errno; - goto finish; + return -errno; } - mkdir_p(q, 0755); - - r = 0; - goto finish; + r = mkdir_p(q, 0755); + if (r < 0) + log_warning("failed to create directory %s: %m", q); + return 0; } if (arg_link_journal == LINK_HOST) { r = mkdir_p(p, 0755); if (r < 0) { log_error("Failed to create %s: %m", p); - goto finish; + return r; } - } else if (access(p, F_OK) < 0) { - r = 0; - goto finish; - } + } else if (access(p, F_OK) < 0) + return 0; if (dir_is_empty(q) == 0) { log_error("%s not empty.", q); - r = -ENOTEMPTY; - goto finish; + return -ENOTEMPTY; } r = mkdir_p(q, 0755); if (r < 0) { log_error("Failed to create %s: %m", q); - goto finish; + return r; } if (mount(p, q, "bind", MS_BIND, NULL) < 0) { log_error("Failed to bind mount journal from host into guest: %m"); - r = -errno; - goto finish; + return -errno; } - r = 0; - -finish: - free(p); - free(q); - free(d); - free(b); - return r; - + return 0; } static int drop_capabilities(void) { @@ -1320,6 +1292,12 @@ int main(int argc, char *argv[]) { if (arg_user) { + /* Note that this resolves user names + * inside the container, and hence + * accesses the NSS modules from the + * container and not the host. This is + * a bit weird... */ + if (get_user_creds((const char**)&arg_user, &uid, &gid, &home, NULL) < 0) { log_error("get_user_creds() failed: %m"); goto child_fail;