diff options
| author | Ondrej Kozina <okozina@redhat.com> | 2016-11-02 17:02:08 +0300 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2017-01-15 17:49:49 +0300 |
| commit | 2269a1fb8ea0c460548abcb0fe09c2e58c5113d4 (patch) | |
| tree | 9b53c9fc49d080ae32020489c67f9c6e569d615b /drivers/md | |
| parent | 7b0668db2acb4c6e136235e4734e6d6c22406edb (diff) | |
| download | linux-2269a1fb8ea0c460548abcb0fe09c2e58c5113d4.tar.xz | |
dm crypt: mark key as invalid until properly loaded
[ Upstream commit 265e9098bac02bc5e36cda21fdbad34cb5b2f48d ]
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>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/dm-crypt.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index b1c2bef46f8d..9c4836f5fea7 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1450,12 +1450,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. */ |