diff options
| -rw-r--r-- | drivers/md/dm-crypt.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 6d2d41ae9e32..2a88b2a0ee41 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -1290,29 +1290,20 @@ static int crypt_setkey_allcpus(struct crypt_config *cc) 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. */ - if (cc->key_size != (key_string_len >> 1)) - goto out; + if (cc->key_size != (strlen(key) >> 1)) + return -EINVAL; /* Hyphen (which gives a key_size of zero) means there is no key. */ if (!cc->key_size && strcmp(key, "-")) - goto out; + return -EINVAL; if (cc->key_size && crypt_decode_key(cc->key, key, cc->key_size) < 0) - goto out; + return -EINVAL; set_bit(DM_CRYPT_KEY_VALID, &cc->flags); - r = crypt_setkey_allcpus(cc); - -out: - /* Hex key string not needed after here, so wipe it. */ - memset(key, '0', key_string_len); - - return r; + return crypt_setkey_allcpus(cc); } static int crypt_wipe_key(struct crypt_config *cc) |