X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup-generator.c;h=5c4a2807a74059af059971f1874cd88fecb5cd74;hp=05808df38041cc29bbaf225a01c2b7cf222d1e2d;hb=608d41f355d580a6f73e76b298bfc1b4e3155b80;hpb=66a78c2b95ba6cc0be15dab68c5af816fb5b7a33 diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 05808df38..5c4a2807a 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -29,11 +29,11 @@ #include "mkdir.h" #include "virt.h" #include "strv.h" +#include "fileio.h" static const char *arg_dest = "/tmp"; static bool arg_enabled = true; static bool arg_read_crypttab = true; -static char **arg_proc_cmdline_disks = NULL; static bool has_option(const char *haystack, const char *needle) { const char *f = haystack; @@ -70,9 +70,8 @@ static int create_disk( const char *password, const char *options) { - char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL; - int r; - FILE *f = NULL; + char _cleanup_free_ *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL; + FILE _cleanup_fclose_ *f = NULL; bool noauto, nofail; assert(name); @@ -81,49 +80,37 @@ static int create_disk( noauto = has_option(options, "noauto"); nofail = has_option(options, "nofail"); - n = unit_name_build_escape("cryptsetup", name, ".service"); - if (!n) { - r = -ENOMEM; - log_error("Failed to allocate unit name."); - goto fail; - } + n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service"); + if (!n) + return log_oom(); - p = join(arg_dest, "/", n, NULL); - if (!p) { - r = -ENOMEM; - log_error("Failed to allocate unit file name."); - goto fail; - } + p = strjoin(arg_dest, "/", n, NULL); + if (!p) + return log_oom(); u = fstab_node_to_udev_node(device); - if (!u) { - r = -ENOMEM; - log_error("Failed to allocate device node."); - goto fail; - } + if (!u) + return log_oom(); d = unit_name_from_path(u, ".device"); - if (!d) { - r = -ENOMEM; - log_error("Failed to allocate device name."); - goto fail; - } + if (!d) + return log_oom(); f = fopen(p, "wxe"); if (!f) { - r = -errno; - log_error("Failed to create unit file: %m"); - goto fail; + log_error("Failed to create unit file %s: %m", p); + return -errno; } fprintf(f, "# Automatically generated by systemd-cryptsetup-generator\n\n" "[Unit]\n" "Description=Cryptography Setup for %%I\n" + "Documentation=man:systemd-cryptsetup@.service(8) man:crypttab(5)\n" "SourcePath=/etc/crypttab\n" "Conflicts=umount.target\n" "DefaultDependencies=no\n" - "BindTo=%s dev-mapper-%%i.device\n" + "BindsTo=%s dev-mapper-%%i.device\n" "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n" "Before=umount.target\n", d, d); @@ -162,86 +149,61 @@ static int create_disk( fflush(f); if (ferror(f)) { - r = -errno; - log_error("Failed to write file: %m"); - goto fail; + log_error("Failed to write file %s: %m", p); + return -errno; } - if (asprintf(&from, "../%s", n) < 0) { - r = -ENOMEM; - goto fail; - } + if (asprintf(&from, "../%s", n) < 0) + return log_oom(); if (!noauto) { - to = join(arg_dest, "/", d, ".wants/", n, NULL); - if (!to) { - r = -ENOMEM; - goto fail; - } + to = strjoin(arg_dest, "/", d, ".wants/", n, NULL); + if (!to) + return log_oom(); mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { log_error("Failed to create symlink '%s' to '%s': %m", from, to); - r = -errno; - goto fail; + return -errno; } free(to); - if (!nofail) - to = join(arg_dest, "/cryptsetup.target.requires/", n, NULL); + to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL); else - to = join(arg_dest, "/cryptsetup.target.wants/", n, NULL); - if (!to) { - r = -ENOMEM; - goto fail; - } + to = strjoin(arg_dest, "/cryptsetup.target.wants/", n, NULL); + if (!to) + return log_oom(); mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { log_error("Failed to create symlink '%s' to '%s': %m", from, to); - r = -errno; - goto fail; + return -errno; } - - free(to); - to = NULL; } e = unit_name_escape(name); - to = join(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL); - if (!to) { - r = -ENOMEM; - goto fail; - } + if (!e) + return log_oom(); + + free(to); + to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL); + if (!to) + return log_oom(); mkdir_parents_label(to, 0755); if (symlink(from, to) < 0) { log_error("Failed to create symlink '%s' to '%s': %m", from, to); - r = -errno; - goto fail; + return -errno; } - r = 0; - -fail: - free(p); - free(n); - free(d); - free(e); - - free(from); - free(to); - - if (f) - fclose(f); - - return r; + return 0; } -static int parse_proc_cmdline(void) { - char *line, *w, *state; +static int parse_proc_cmdline(char ***arg_proc_cmdline_disks) { + char _cleanup_free_ *line = NULL; + char *w = NULL, *state = NULL; int r; size_t l; @@ -255,13 +217,11 @@ static int parse_proc_cmdline(void) { } FOREACH_WORD_QUOTED(w, l, line, state) { - char *word; + char _cleanup_free_ *word = NULL; word = strndup(w, l); - if (!word) { - r = -ENOMEM; - goto finish; - } + if (!word) + return log_oom(); if (startswith(word, "luks=")) { r = parse_boolean(word + 5); @@ -300,28 +260,24 @@ static int parse_proc_cmdline(void) { } else if (startswith(word, "luks.uuid=")) { char **t; - t = strv_append(arg_proc_cmdline_disks, word + 10); - if (!t) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } - strv_free(arg_proc_cmdline_disks); - arg_proc_cmdline_disks = t; + t = strv_append(*arg_proc_cmdline_disks, word + 10); + if (!t) + return log_oom(); + + strv_free(*arg_proc_cmdline_disks); + *arg_proc_cmdline_disks = t; } else if (startswith(word, "rd.luks.uuid=")) { if (in_initrd()) { char **t; - t = strv_append(arg_proc_cmdline_disks, word + 13); - if (!t) { - log_error("Out of memory"); - r = -ENOMEM; - goto finish; - } - strv_free(arg_proc_cmdline_disks); - arg_proc_cmdline_disks = t; + t = strv_append(*arg_proc_cmdline_disks, word + 13); + if (!t) + return log_oom(); + + strv_free(*arg_proc_cmdline_disks); + *arg_proc_cmdline_disks = t; } } else if (startswith(word, "luks.") || @@ -329,22 +285,20 @@ static int parse_proc_cmdline(void) { log_warning("Unknown kernel switch %s. Ignoring.", word); } - - free(word); } - r = 0; + strv_uniq(*arg_proc_cmdline_disks); -finish: - free(line); - return r; + return 0; } int main(int argc, char *argv[]) { - FILE *f = NULL; - int r = EXIT_SUCCESS; + FILE _cleanup_fclose_ *f = NULL; unsigned n = 0; + int r = EXIT_SUCCESS; char **i; + char _cleanup_strv_free_ **arg_proc_cmdline_disks_done = NULL; + char _cleanup_strv_free_ **arg_proc_cmdline_disks = NULL; if (argc > 1 && argc != 4) { log_error("This program takes three or no arguments."); @@ -360,91 +314,106 @@ int main(int argc, char *argv[]) { umask(0022); - if (parse_proc_cmdline() < 0) + if (parse_proc_cmdline(&arg_proc_cmdline_disks) < 0) return EXIT_FAILURE; - if (!arg_enabled) { - r = EXIT_SUCCESS; - goto finish; - } + if (!arg_enabled) + return EXIT_SUCCESS; - STRV_FOREACH(i, arg_proc_cmdline_disks) { - char *name, *device; - const char *p = *i; + if (arg_read_crypttab) { + f = fopen("/etc/crypttab", "re"); - if (startswith(p, "luks-")) - p += 5; + if (!f) { + if (errno == ENOENT) + r = EXIT_SUCCESS; + else { + r = EXIT_FAILURE; + log_error("Failed to open /etc/crypttab: %m"); + } + } else for (;;) { + char line[LINE_MAX], *l; + char _cleanup_free_ *name = NULL, *device = NULL, *password = NULL, *options = NULL; + int k; - name = strappend("luks-", *i); - device = strappend("UUID=", *i); + if (!fgets(line, sizeof(line), f)) + break; - if (!name || !device) { - log_error("Out of memory"); - r = EXIT_FAILURE; - free(name); - free(device); - goto finish; - } + n++; - if (create_disk(name, device, NULL, NULL) < 0) - r = EXIT_FAILURE; + l = strstrip(line); + if (*l == '#' || *l == 0) + continue; - free(name); - free(device); - } + k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options); + if (k < 2 || k > 4) { + log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); + r = EXIT_FAILURE; + continue; + } - if (!arg_read_crypttab) - return r; + if (arg_proc_cmdline_disks) { + /* + If luks UUIDs are specified on the kernel command line, use them as a filter + for /etc/crypttab and only generate units for those. + */ + STRV_FOREACH(i, arg_proc_cmdline_disks) { + char _cleanup_free_ *proc_device = NULL, *proc_name = NULL; + const char *p = *i; - f = fopen("/etc/crypttab", "re"); - if (!f) { + if (startswith(p, "luks-")) + p += 5; - if (errno == ENOENT) - r = EXIT_SUCCESS; - else { - r = EXIT_FAILURE; - log_error("Failed to open /etc/crypttab: %m"); - } + proc_name = strappend("luks-", p); + proc_device = strappend("UUID=", p); + + if (!proc_name || !proc_device) + return log_oom(); + + if (streq(proc_device, device) || streq(proc_name, name)) { + char **t; - goto finish; + if (create_disk(name, device, password, options) < 0) + r = EXIT_FAILURE; + + t = strv_append(arg_proc_cmdline_disks_done, p); + if (!t) + return log_oom(); + + strv_free(arg_proc_cmdline_disks_done); + arg_proc_cmdline_disks_done = t; + } + } + } else { + if (create_disk(name, device, password, options) < 0) + r = EXIT_FAILURE; + } + } } - for (;;) { - char line[LINE_MAX], *l; - char *name = NULL, *device = NULL, *password = NULL, *options = NULL; - int k; + STRV_FOREACH(i, arg_proc_cmdline_disks) { + /* + Generate units for those UUIDs, which were specified + on the kernel command line and not yet written. + */ - if (!fgets(line, sizeof(line), f)) - break; + char _cleanup_free_ *name = NULL, *device = NULL; + const char *p = *i; - n++; + if (startswith(p, "luks-")) + p += 5; - l = strstrip(line); - if (*l == '#' || *l == 0) + if (strv_contains(arg_proc_cmdline_disks_done, p)) continue; - k = sscanf(l, "%ms %ms %ms %ms", &name, &device, &password, &options); - if (k < 2 || k > 4) { - log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); - r = EXIT_FAILURE; - goto next; - } + name = strappend("luks-", p); + device = strappend("UUID=", p); - if (create_disk(name, device, password, options) < 0) - r = EXIT_FAILURE; + if (!name || !device) + return log_oom(); - next: - free(name); - free(device); - free(password); - free(options); + if (create_disk(name, device, NULL, "timeout=0") < 0) + r = EXIT_FAILURE; } -finish: - if (f) - fclose(f); - - strv_free(arg_proc_cmdline_disks); - return r; }