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=7eae1c8c6721f07353a9603fab575c98c37a8ad0;hp=38a7cfa0b6fdc07ac507ebd635995b832317ee15;hb=8973790ee6f62132b1b57de15c4edaef2c097004;hpb=e2cb60fa97e6a6483a98b685ff0d20c61da38c00 diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c index 38a7cfa0b..7eae1c8c6 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -34,7 +34,6 @@ 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; @@ -71,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; + _cleanup_free_ char *p = NULL, *n = NULL, *d = NULL, *u = NULL, *from = NULL, *to = NULL, *e = NULL; + _cleanup_fclose_ FILE *f = NULL; bool noauto, nofail; assert(name); @@ -83,59 +81,65 @@ static int create_disk( nofail = has_option(options, "nofail"); n = unit_name_from_path_instance("systemd-cryptsetup", name, ".service"); - if (!n) { - r = log_oom(); - goto fail; - } + if (!n) + return log_oom(); p = strjoin(arg_dest, "/", n, NULL); - if (!p) { - r = log_oom(); - goto fail; - } + if (!p) + return log_oom(); u = fstab_node_to_udev_node(device); - if (!u) { - r = log_oom(); - goto fail; - } + if (!u) + return log_oom(); d = unit_name_from_path(u, ".device"); - if (!d) { - r = log_oom(); - goto fail; - } + if (!d) + return log_oom(); f = fopen(p, "wxe"); if (!f) { - r = -errno; log_error("Failed to create unit file %s: %m", p); - goto fail; + return -errno; } - fprintf(f, + fputs( "# Automatically generated by systemd-cryptsetup-generator\n\n" "[Unit]\n" - "Description=Cryptography Setup for %%I\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" - "BindsTo=%s dev-mapper-%%i.device\n" - "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n" - "Before=umount.target\n", - d, d); + "BindsTo=dev-mapper-%i.device\n" + "After=systemd-readahead-collect.service systemd-readahead-replay.service\n", + f); if (!nofail) fprintf(f, "Before=cryptsetup.target\n"); - if (password && (streq(password, "/dev/urandom") || - streq(password, "/dev/random") || - streq(password, "/dev/hw_random"))) - fputs("After=systemd-random-seed-load.service\n", f); + if (password) { + if (streq(password, "/dev/urandom") || + streq(password, "/dev/random") || + streq(password, "/dev/hw_random")) + fputs("After=systemd-random-seed-load.service\n", f); + else if (!streq(password, "-") && + !streq(password, "none")) + fprintf(f, + "RequiresMountsFor=%s\n", + password); + } + + if (is_device_path(u)) + fprintf(f, + "BindsTo=%s\n" + "After=%s\n" + "Before=umount.target\n", + d, d); else - fputs("Before=local-fs.target\n", f); + fprintf(f, + "RequiresMountsFor=%s\n", + u); fprintf(f, "\n[Service]\n" @@ -160,86 +164,78 @@ static int create_disk( fflush(f); if (ferror(f)) { - r = -errno; log_error("Failed to write file %s: %m", p); - goto fail; + return -errno; } - if (asprintf(&from, "../%s", n) < 0) { - r = log_oom(); - goto fail; - } + if (asprintf(&from, "../%s", n) < 0) + return log_oom(); if (!noauto) { to = strjoin(arg_dest, "/", d, ".wants/", n, NULL); - if (!to) { - r = log_oom(); - goto fail; - } + 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; + log_error("Failed to create symlink %s: %m", to); + return -errno; } free(to); - if (!nofail) to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL); else to = strjoin(arg_dest, "/cryptsetup.target.wants/", n, NULL); - if (!to) { - r = log_oom(); - goto fail; - } + 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; + log_error("Failed to create symlink %s: %m", to); + return -errno; } - - free(to); - to = NULL; } e = unit_name_escape(name); + if (!e) + return log_oom(); + + free(to); to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL); - if (!to) { - r = log_oom(); - goto fail; - } + 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; + log_error("Failed to create symlink %s: %m", to); + return -errno; } - r = 0; - -fail: - free(p); - free(n); - free(d); - free(e); - - free(from); - free(to); - - if (f) - fclose(f); + if (!noauto && !nofail) { + int r; + free(p); + p = strjoin(arg_dest, "/dev-mapper-", e, ".device.d/50-job-timeout-sec-0.conf", NULL); + if (!p) + return log_oom(); + + mkdir_parents_label(p, 0755); + + r = write_string_file(p, + "# Automatically generated by systemd-cryptsetup-generator\n\n" + "[Unit]\n" + "JobTimeoutSec=0\n"); /* the binary handles timeouts anyway */ + if (r) + return r; + } - 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 **arg_proc_cmdline_keyfile) { + _cleanup_free_ char *line = NULL; + char *w = NULL, *state = NULL; int r; size_t l; @@ -253,13 +249,11 @@ static int parse_proc_cmdline(void) { } FOREACH_WORD_QUOTED(w, l, line, state) { - char *word; + _cleanup_free_ char *word = NULL; word = strndup(w, l); - if (!word) { - r = log_oom(); - goto finish; - } + if (!word) + return log_oom(); if (startswith(word, "luks=")) { r = parse_boolean(word + 5); @@ -296,28 +290,29 @@ 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) { - r = log_oom(); - goto finish; - } - strv_free(arg_proc_cmdline_disks); - arg_proc_cmdline_disks = t; + if (strv_extend(arg_proc_cmdline_disks, word + 10) < 0) + return log_oom(); } else if (startswith(word, "rd.luks.uuid=")) { if (in_initrd()) { - char **t; + if (strv_extend(arg_proc_cmdline_disks, word + 13) < 0) + return log_oom(); + } - t = strv_append(arg_proc_cmdline_disks, word + 13); - if (!t) { - r = log_oom(); - goto finish; - } - strv_free(arg_proc_cmdline_disks); - arg_proc_cmdline_disks = t; + } else if (startswith(word, "luks.key=")) { + *arg_proc_cmdline_keyfile = strdup(word + 9); + if (!*arg_proc_cmdline_keyfile) + return log_oom(); + + } else if (startswith(word, "rd.luks.key=")) { + + if (in_initrd()) { + if (*arg_proc_cmdline_keyfile) + free(*arg_proc_cmdline_keyfile); + *arg_proc_cmdline_keyfile = strdup(word + 12); + if (!*arg_proc_cmdline_keyfile) + return log_oom(); } } else if (startswith(word, "luks.") || @@ -325,25 +320,21 @@ static int parse_proc_cmdline(void) { log_warning("Unknown kernel switch %s. Ignoring.", word); } - - free(word); } - strv_uniq(arg_proc_cmdline_disks); - - 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; + _cleanup_strv_free_ char **arg_proc_cmdline_disks_done = NULL; + _cleanup_strv_free_ char **arg_proc_cmdline_disks = NULL; + _cleanup_free_ char *arg_proc_cmdline_keyfile = NULL; + _cleanup_fclose_ FILE *f = NULL; unsigned n = 0; + int r = EXIT_SUCCESS; char **i; - char **arg_proc_cmdline_disks_done = NULL; if (argc > 1 && argc != 4) { log_error("This program takes three or no arguments."); @@ -359,17 +350,16 @@ int main(int argc, char *argv[]) { umask(0022); - if (parse_proc_cmdline() < 0) + if (parse_proc_cmdline(&arg_proc_cmdline_disks, &arg_proc_cmdline_keyfile) < 0) return EXIT_FAILURE; - if (!arg_enabled) { - r = EXIT_SUCCESS; - goto finish; - } + if (!arg_enabled) + return EXIT_SUCCESS; if (arg_read_crypttab) { - f = fopen("/etc/crypttab", "re"); + struct stat st; + f = fopen("/etc/crypttab", "re"); if (!f) { if (errno == ENOENT) r = EXIT_SUCCESS; @@ -378,12 +368,21 @@ int main(int argc, char *argv[]) { log_error("Failed to open /etc/crypttab: %m"); } - goto finish; + goto next; + } + + if (fstat(fileno(f), &st) < 0) { + log_error("Failed to stat /etc/crypttab: %m"); + r = EXIT_FAILURE; + goto next; } + if (st.st_mode & 0005) + log_warning("/etc/crypttab is world-readable. This is usually not a good idea."); + for (;;) { char line[LINE_MAX], *l; - char *name = NULL, *device = NULL, *password = NULL, *options = NULL; + _cleanup_free_ char *name = NULL, *device = NULL, *password = NULL, *options = NULL; int k; if (!fgets(line, sizeof(line), f)) @@ -399,7 +398,7 @@ int main(int argc, char *argv[]) { if (k < 2 || k > 4) { log_error("Failed to parse /etc/crypttab:%u, ignoring.", n); r = EXIT_FAILURE; - goto next; + continue; } if (arg_proc_cmdline_disks) { @@ -408,7 +407,7 @@ int main(int argc, char *argv[]) { for /etc/crypttab and only generate units for those. */ STRV_FOREACH(i, arg_proc_cmdline_disks) { - char *proc_device, *proc_name; + _cleanup_free_ char *proc_device = NULL, *proc_name = NULL; const char *p = *i; if (startswith(p, "luks-")) @@ -417,51 +416,32 @@ int main(int argc, char *argv[]) { proc_name = strappend("luks-", p); proc_device = strappend("UUID=", p); - if (!proc_name || !proc_device) { - log_oom(); - r = EXIT_FAILURE; - free(proc_name); - free(proc_device); - goto finish; - } - if (streq(proc_device, device) || streq(proc_name, name)) { - char **t; + if (!proc_name || !proc_device) + return log_oom(); + if (streq(proc_device, device) || streq(proc_name, name)) { if (create_disk(name, device, password, options) < 0) r = EXIT_FAILURE; - t = strv_append(arg_proc_cmdline_disks_done, p); - if (!t) { - r = log_oom(); - goto finish; - } - strv_free(arg_proc_cmdline_disks_done); - arg_proc_cmdline_disks_done = t; + if (strv_extend(&arg_proc_cmdline_disks_done, p) < 0) + return log_oom(); } - - free(proc_device); - free(proc_name); } } else { if (create_disk(name, device, password, options) < 0) r = EXIT_FAILURE; } - - next: - free(name); - free(device); - free(password); - free(options); } } +next: STRV_FOREACH(i, arg_proc_cmdline_disks) { /* Generate units for those UUIDs, which were specified on the kernel command line and not yet written. */ - char *name, *device; + _cleanup_free_ char *name = NULL, *device = NULL; const char *p = *i; if (startswith(p, "luks-")) @@ -473,27 +453,12 @@ int main(int argc, char *argv[]) { name = strappend("luks-", p); device = strappend("UUID=", p); - if (!name || !device) { - log_oom(); - r = EXIT_FAILURE; - free(name); - free(device); - goto finish; - } + if (!name || !device) + return log_oom(); - if (create_disk(name, device, NULL, "timeout=0") < 0) + if (create_disk(name, device, arg_proc_cmdline_keyfile, "timeout=0") < 0) r = EXIT_FAILURE; - - free(name); - free(device); } -finish: - if (f) - fclose(f); - - strv_free(arg_proc_cmdline_disks); - strv_free(arg_proc_cmdline_disks_done); - return r; }