UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

dm crypt: set key size early 

Simplify key size verification (hexadecimal string) and
set key size early in constructor.

(Patch required by later changes.)

Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Milan Broz 2011-01-13 19:59:49 +00:00 committed by Alasdair G Kergon
parent 4a1aeb9829
commit 69a8cfcda2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/md/dm-crypt.c
View File

@ -973,15 +973,15 @@ static void crypt_encode_key(char *hex, u8 *key, unsigned int size)
static int crypt_set_key(struct crypt_config *cc, char *key) static int crypt_set_key(struct crypt_config *cc, char *key)
{ {
unsigned key_size = strlen(key) >> 1; /* The key size may not be changed. */
if (cc->key_size != (strlen(key) >> 1))
if (cc->key_size && cc->key_size != key_size)
return -EINVAL; return -EINVAL;
cc->key_size = key_size; /* initial settings */ /* Hyphen (which gives a key_size of zero) means there is no key. */
if (!cc->key_size && strcmp(key, "-"))
return -EINVAL;
if ((!key_size && strcmp(key, "-")) || if (cc->key_size && crypt_decode_key(cc->key, key, cc->key_size) < 0)
(key_size && crypt_decode_key(cc->key, key, key_size) < 0))
return -EINVAL; return -EINVAL;
set_bit(DM_CRYPT_KEY_VALID, &cc->flags); set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
@ -1194,6 +1194,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
ti->error = "Cannot allocate encryption context"; ti->error = "Cannot allocate encryption context";
return -ENOMEM; return -ENOMEM;
} }
cc->key_size = key_size;
ti->private = cc; ti->private = cc;
ret = crypt_ctr_cipher(ti, argv[0], argv[1]); ret = crypt_ctr_cipher(ti, argv[0], argv[1]);