From 89053aff0cc36dfcee6fda6e83b13f6f68c05a82 Mon Sep 17 00:00:00 2001

From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>

Date: Thu, 12 Jun 2014 22:50:04 +0200

Subject: [PATCH] cryptsetup: check that password is not null

Beef up the assert to protect against passing null to strlen.

Found with scan-build.

(cherry picked from commit f268f57f6344d3a2ccf447352ff3ed1313c4a199)

---

 src/cryptsetup/cryptsetup.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c

index 812b32f6..a67d85e6 100644

--- a/src/cryptsetup/cryptsetup.c

+++ b/src/cryptsetup/cryptsetup.c

@@ -344,7 +344,7 @@ static int attach_tcrypt(struct crypt_device *cd,

         assert(cd);

         assert(name);

-        assert(key_file || passwords);

+        assert(key_file || (passwords && passwords[0]));

         if (arg_tcrypt_hidden)

                 params.flags |= CRYPT_TCRYPT_HIDDEN_HEADER;