From bdd73ac5c221d393cb9c560c5b212fffeda4f296 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 27 Nov 2017 12:16:09 +0000 Subject: [PATCH] dissect-image: simplify check for passphrase presence m->encrypted is set when fstype=="crypto_LUKS", but this is not obvious when reading decrypt_partition(). Just check if passphrase is set before using it. --- src/shared/dissect-image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 75e3431f28..219ba8cb0b 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -861,6 +861,9 @@ static int decrypt_partition( if (!streq(m->fstype, "crypto_LUKS")) return 0; + if (!passphrase) + return -ENOKEY; + r = make_dm_name_and_node(m->node, "-decrypted", &name, &node); if (r < 0) return r; @@ -1006,9 +1009,6 @@ int dissected_image_decrypt( } #if HAVE_LIBCRYPTSETUP - if (m->encrypted && !passphrase) - return -ENOKEY; - d = new0(DecryptedImage, 1); if (!d) return -ENOMEM; -- 2.25.1