summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOndrej Kozina <okozina@redhat.com>2016-11-02 15:02:08 +0100
committerMike Snitzer <snitzer@redhat.com>2016-11-21 09:51:59 -0500
commit265e9098bac02bc5e36cda21fdbad34cb5b2f48d (patch)
tree6d98e458484e544fccf7c994e1ee749f53fb68b9 /drivers
parent0dae7fe59749ba3a3644f717315097422bea9680 (diff)
downloadlinux-stable-265e9098bac02bc5e36cda21fdbad34cb5b2f48d.tar.gz
linux-stable-265e9098bac02bc5e36cda21fdbad34cb5b2f48d.tar.bz2
linux-stable-265e9098bac02bc5e36cda21fdbad34cb5b2f48d.zip
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/md/dm-crypt.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 4999c7497f95..01fdaec5df60 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -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. */