From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:55344 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751238AbdAMHoD (ORCPT ); Fri, 13 Jan 2017 02:44:03 -0500 From: Jiri Slaby To: stable@vger.kernel.org Cc: Ondrej Kozina , Mike Snitzer , Jiri Slaby Subject: [patch added to 3.12-stable] dm crypt: mark key as invalid until properly loaded Date: Fri, 13 Jan 2017 08:41:52 +0100 Message-Id: <20170113074159.26811-26-jslaby@suse.cz> In-Reply-To: <20170113074159.26811-1-jslaby@suse.cz> References: <20170113074159.26811-1-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org List-ID: From: Ondrej Kozina This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== commit 265e9098bac02bc5e36cda21fdbad34cb5b2f48d upstream. 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. Signed-off-by: Ondrej Kozina Reviewed-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Jiri Slaby --- drivers/md/dm-crypt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 0f64dc596bce..c1b36e208669 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1283,12 +1283,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. */ -- 2.11.0