diff options
author | James Morris <jmorris@namei.org> | 2011-09-27 09:20:46 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2011-09-27 09:20:46 +1000 |
commit | c6cb56fc94f4efaec2d4ad74bed2be7883179ccd (patch) | |
tree | cc4ebf2231093ab57c2e868fbdf176791de600db /security/keys/encrypted-keys/encrypted.c | |
parent | a427fd14d3edf6396c4b9638dbc8e2972afaa05b (diff) | |
parent | 8c35ad20270de91d0f3bfe521daa3b7983ee8db7 (diff) |
Merge branch 'next-hex2bin' of git://github.com/mzohar/linux-evm into next
Diffstat (limited to 'security/keys/encrypted-keys/encrypted.c')
-rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index 3f577954b85a..f33804c1b4c8 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c @@ -667,11 +667,19 @@ static int encrypted_key_decrypt(struct encrypted_key_payload *epayload, return -EINVAL; hex_encoded_data = hex_encoded_iv + (2 * ivsize) + 2; - hex2bin(epayload->iv, hex_encoded_iv, ivsize); - hex2bin(epayload->encrypted_data, hex_encoded_data, encrypted_datalen); + ret = hex2bin(epayload->iv, hex_encoded_iv, ivsize); + if (ret < 0) + return -EINVAL; + ret = hex2bin(epayload->encrypted_data, hex_encoded_data, + encrypted_datalen); + if (ret < 0) + return -EINVAL; hmac = epayload->format + epayload->datablob_len; - hex2bin(hmac, hex_encoded_data + (encrypted_datalen * 2), HASH_SIZE); + ret = hex2bin(hmac, hex_encoded_data + (encrypted_datalen * 2), + HASH_SIZE); + if (ret < 0) + return -EINVAL; mkey = request_master_key(epayload, &master_key, &master_keylen); if (IS_ERR(mkey)) |