Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dm crypt: wipe keys string immediately after key is set

Browse source 
Always wipe the original copy of the key after processing it
in crypt_set_key().

Signed-off-by: Milan Broz <mbroz@redhat.com>
Acked-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Milan Broz 2011-03-24 13:54:27 +00:00 • committed by Alasdair G Kergon
parent 3407ef5262
commit de8be5ac70
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/md/dm-crypt.c
View file

@ -1331,20 +1331,29 @@ static int crypt_setkey_allcpus(struct crypt_config *cc)
static int crypt_set_key(struct crypt_config *cc, char *key) static int crypt_set_key(struct crypt_config *cc, char *key)
{ {
int r = -EINVAL;
int key_string_len = strlen(key);
/* The key size may not be changed. */ /* The key size may not be changed. */
if (cc->key_size != (strlen(key) >> 1)) if (cc->key_size != (key_string_len >> 1))
return -EINVAL; goto out;
/* Hyphen (which gives a key_size of zero) means there is no key. */ /* Hyphen (which gives a key_size of zero) means there is no key. */
if (!cc->key_size && strcmp(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) 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); set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
return crypt_setkey_allcpus(cc); r = crypt_setkey_allcpus(cc);
out:
/* Hex key string not needed after here, so wipe it. */
memset(key, '0', key_string_len);
return r;
} }
static int crypt_wipe_key(struct crypt_config *cc) static int crypt_wipe_key(struct crypt_config *cc)