Commit 506d7d52 authored by Ondrej Kozina's avatar Ondrej Kozina Committed by Sasha Levin

dm crypt: mark key as invalid until properly loaded

[ Upstream commit 265e9098 ]

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: default avatarOndrej Kozina <okozina@redhat.com>
Reviewed-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 4a703680
...@@ -1482,12 +1482,15 @@ static int crypt_set_key(struct crypt_config *cc, char *key) ...@@ -1482,12 +1482,15 @@ static int crypt_set_key(struct crypt_config *cc, char *key)
if (!cc->key_size && strcmp(key, "-")) if (!cc->key_size && strcmp(key, "-"))
goto out; 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) if (cc->key_size && crypt_decode_key(cc->key, key, cc->key_size) < 0)
goto out; goto out;
set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
r = crypt_setkey_allcpus(cc); r = crypt_setkey_allcpus(cc);
if (!r)
set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
out: out:
/* Hex key string not needed after here, so wipe it. */ /* Hex key string not needed after here, so wipe it. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment