Commit 265e9098 authored Nov 02, 2016 by Ondrej Kozina Committed by Mike Snitzer Nov 21, 2016

dm crypt: mark key as invalid until properly loaded



In crypt_set_key(), if a failure occurs while replacing the old key
(e.g. tfm->setkey() fails) the key must not have DM_CRYPT_KEY_VALID flag
set.  Otherwise, the crypto layer would have an invalid key that still
has DM_CRYPT_KEY_VALID flag set.

Cc: stable@vger.kernel.org
Signed-off-by: Ondrej Kozina <okozina@redhat.com>
Reviewed-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>

parent 0dae7fe5

drivers/md/dm-crypt.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1497,12 +1497,15 @@ static int crypt_set_key(struct crypt_config cc, char key)
		if (!cc->key_size && strcmp(key, "-"))
		goto out;

		/* clear the flag since following operations may invalidate previously valid key */
		clear_bit(DM_CRYPT_KEY_VALID, &cc->flags);

		if (cc->key_size && crypt_decode_key(cc->key, key, cc->key_size) < 0)
		goto out;

		set_bit(DM_CRYPT_KEY_VALID, &cc->flags);

		r = crypt_setkey_allcpus(cc);
		if (!r)
		set_bit(DM_CRYPT_KEY_VALID, &cc->flags);

		out:
		/* Hex key string not needed after here, so wipe it. */