From patchwork Thu Feb  3 00:08:14 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Milan Broz <mbroz@redhat.com>
X-Patchwork-Id: 528101
X-Patchwork-Delegate: agk@redhat.com
Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p130BJE9010092
	for <patchwork-dm-devel@patchwork.kernel.org>;
	Thu, 3 Feb 2011 00:11:45 GMT
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
	(lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p1308QEl014104;
	Wed, 2 Feb 2011 19:08:27 -0500
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
	(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id p1308PA1019337 for <dm-devel@listman.util.phx.redhat.com>;
	Wed, 2 Feb 2011 19:08:25 -0500
Received: from tawny.mazyland.cz (vpn1-4-126.ams2.redhat.com [10.36.4.126])
	by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with
	ESMTP id p1308I5d031888; Wed, 2 Feb 2011 19:08:19 -0500
From: Milan Broz <mbroz@redhat.com>
To: dm-devel@redhat.com
Date: Thu,  3 Feb 2011 01:08:14 +0100
Message-Id: <1296691696-23722-1-git-send-email-mbroz@redhat.com>
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
X-loop: dm-devel@redhat.com
Cc: Milan Broz <mbroz@redhat.com>
Subject: [dm-devel] [PATCH 1/3] dm crypt: wipe keys string immediately after
	key is set
X-BeenThere: dm-devel@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
Reply-To: device-mapper development <dm-devel@redhat.com>
List-Id: device-mapper development <dm-devel.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/dm-devel>
List-Post: <mailto:dm-devel@redhat.com>
List-Help: <mailto:dm-devel-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Sender: dm-devel-bounces@redhat.com
Errors-To: dm-devel-bounces@redhat.com
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Thu, 03 Feb 2011 00:11:45 +0000 (UTC)


diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 4e054bd..d748433 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1331,20 +1331,26 @@ static int crypt_setkey_allcpus(struct crypt_config *cc)
 
 static int crypt_set_key(struct crypt_config *cc, char *key)
 {
+	int r = -EINVAL, key_string_len = strlen(key);
+
 	/* The key size may not be changed. */
-	if (cc->key_size != (strlen(key) >> 1))
-		return -EINVAL;
+	if (cc->key_size != (key_string_len >> 1))
+		goto out;
 
 	/* Hyphen (which gives a key_size of zero) means there is no key. */
 	if (!cc->key_size && strcmp(key, "-"))
-		return -EINVAL;
+		goto out;
 
 	if (cc->key_size && crypt_decode_key(cc->key, key, cc->key_size) < 0)
-		return -EINVAL;
+		goto out;
 
 	set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
 
-	return crypt_setkey_allcpus(cc);
+	r = crypt_setkey_allcpus(cc);
+out:
+	/* Wipe hexa key string as soon as possible */
+	memset(key, '0', key_string_len);
+	return r;
 }
 
 static int crypt_wipe_key(struct crypt_config *cc)