From: Ondrej Kozina Date: Wed, 2 Nov 2016 14:02:08 +0000 (+0100) Subject: dm crypt: mark key as invalid until properly loaded X-Git-Tag: v4.1.38~58 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=506d7d5211741a6bdd5424d4145919acbd3923af;p=platform%2Fkernel%2Flinux-exynos.git 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 Reviewed-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Sasha Levin --- diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index ce507a405d05..ab16f33b743b 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1482,12 +1482,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. */