X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcryptsetup%2Fcryptsetup.c;h=a24e61a0358e2a7a1f947f939ddba4b4046d321f;hp=f33284370c0d7c3d588116198abe30ac67cb7d77;hb=8d768d9962b3c9348a732bb83434911e1d2d9775;hpb=f274ece0f76b5709408821e317e87aef76123db6 diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index f33284370..a24e61a03 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -44,7 +44,7 @@ static unsigned opt_tries = 0; static bool opt_readonly = false; static bool opt_verify = false; static bool opt_discards = false; -static usec_t opt_timeout = DEFAULT_TIMEOUT_USEC; +static usec_t opt_timeout = 0; /* Options Debian's crypttab knows we don't: @@ -68,7 +68,8 @@ static int parse_one_option(const char *option) { if (startswith(option, "cipher=")) { char *t; - if (!(t = strdup(option+7))) + t = strdup(option+7); + if (!t) return -ENOMEM; free(opt_cipher); @@ -98,7 +99,8 @@ static int parse_one_option(const char *option) { } else if (startswith(option, "hash=")) { char *t; - if (!(t = strdup(option+5))) + t = strdup(option+5); + if (!t) return -ENOMEM; free(opt_hash); @@ -111,7 +113,7 @@ static int parse_one_option(const char *option) { return 0; } - } else if (streq(option, "readonly")) + } else if (streq(option, "readonly") || streq(option, "read-only")) opt_readonly = true; else if (streq(option, "verify")) opt_verify = true; @@ -125,7 +127,7 @@ static int parse_one_option(const char *option) { opt_type = CRYPT_PLAIN; else if (startswith(option, "timeout=")) { - if (parse_usec(option+8, &opt_timeout) < 0) { + if (parse_sec(option+8, &opt_timeout) < 0) { log_error("timeout= parse failure, ignoring."); return 0; } @@ -137,22 +139,19 @@ static int parse_one_option(const char *option) { } static int parse_options(const char *options) { - char *state; - char *w; + char *state, *w; size_t l; + int r; assert(options); FOREACH_WORD_SEPARATOR(w, l, options, ",", state) { - char *o; - int r; + _cleanup_free_ char *o; - if (!(o = strndup(w, l))) + o = strndup(w, l); + if (!o) return -ENOMEM; - r = parse_one_option(o); - free(o); - if (r < 0) return r; } @@ -165,11 +164,19 @@ static void log_glue(int level, const char *msg, void *usrptr) { } static char *disk_description(const char *path) { + + static const char name_fields[] = { + "ID_PART_ENTRY_NAME\0" + "DM_NAME\0" + "ID_MODEL_FROM_DATABASE\0" + "ID_MODEL\0" + }; + struct udev *udev = NULL; struct udev_device *device = NULL; struct stat st; char *description = NULL; - const char *model; + const char *i; assert(path); @@ -179,16 +186,23 @@ static char *disk_description(const char *path) { if (!S_ISBLK(st.st_mode)) return NULL; - if (!(udev = udev_new())) + udev = udev_new(); + if (!udev) return NULL; - if (!(device = udev_device_new_from_devnum(udev, 'b', st.st_rdev))) + device = udev_device_new_from_devnum(udev, 'b', st.st_rdev); + if (!device) goto finish; - if ((model = udev_device_get_property_value(device, "ID_MODEL_FROM_DATABASE")) || - (model = udev_device_get_property_value(device, "ID_MODEL")) || - (model = udev_device_get_property_value(device, "DM_NAME"))) - description = strdup(model); + NULSTR_FOREACH(i, name_fields) { + const char *name; + + name = udev_device_get_property_value(device, i); + if (!isempty(name)) { + description = strdup(name); + break; + } + } finish: if (device) @@ -289,8 +303,10 @@ int main(int argc, char *argv[]) { key_file = argv[4]; } - if (argc >= 6 && argv[5][0] && !streq(argv[5], "-")) - parse_options(argv[5]); + if (argc >= 6 && argv[5][0] && !streq(argv[5], "-")) { + if (parse_options(argv[5]) < 0) + goto finish; + } /* A delicious drop of snake oil */ mlockall(MCL_FUTURE); @@ -315,7 +331,8 @@ int main(int argc, char *argv[]) { name = name_buffer ? name_buffer : argv[2]; - if ((k = crypt_init(&cd, argv[3]))) { + k = crypt_init(&cd, argv[3]); + if (k) { log_error("crypt_init() failed: %s", strerror(-k)); goto finish; } @@ -353,8 +370,9 @@ int main(int argc, char *argv[]) { size_t l; l = strcspn(opt_cipher, "-"); + truncated_cipher = strndup(opt_cipher, l); - if (!(truncated_cipher = strndup(opt_cipher, l))) { + if (!truncated_cipher) { log_oom(); goto finish; } @@ -373,8 +391,7 @@ int main(int argc, char *argv[]) { passwords = NULL; if (!key_file) { - char *text; - char **p; + char *text, **p; if (asprintf(&text, "Please enter passphrase for disk %s!", name) < 0) { log_oom(); @@ -444,10 +461,7 @@ int main(int argc, char *argv[]) { k = crypt_load(cd, CRYPT_LUKS1, NULL); if ((!opt_type && k < 0) || streq_ptr(opt_type, CRYPT_PLAIN)) { - struct crypt_params_plain params; - - zero(params); - params.hash = hash; + struct crypt_params_plain params = { .hash = hash }; /* for CRYPT_PLAIN limit reads * from keyfile to key length, and @@ -486,6 +500,11 @@ int main(int argc, char *argv[]) { if (key_file) k = crypt_activate_by_keyfile_offset(cd, argv[2], CRYPT_ANY_SLOT, key_file, opt_keyfile_size, opt_keyfile_offset, flags); + if (k < 0) { + log_error("Failed to activate with key file '%s': %s", key_file, strerror(-k)); + key_file = NULL; + continue; + } else { char **p; @@ -521,14 +540,16 @@ int main(int argc, char *argv[]) { } else if (streq(argv[1], "detach")) { int k; - if ((k = crypt_init_by_name(&cd, argv[2]))) { + k = crypt_init_by_name(&cd, argv[2]); + if (k) { log_error("crypt_init() failed: %s", strerror(-k)); goto finish; } crypt_set_log_callback(cd, log_glue, NULL); - if ((k = crypt_deactivate(cd, argv[2])) < 0) { + k = crypt_deactivate(cd, argv[2]); + if (k < 0) { log_error("Failed to deactivate: %s", strerror(-k)); goto finish; }