From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 27 Nov 2017 12:16:09 +0000 (+0000)
Subject: dissect-image: simplify check for passphrase presence
X-Git-Tag: v236~102^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bdd73ac5c221d393cb9c560c5b212fffeda4f296;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 75e3431f283..219ba8cb0bd 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;