lkml.org 
[lkml]   [2011]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 3/4] encrypted-keys: check hex2bin result
    Date
    For each hex2bin call in encrypted keys, check that the ascii hex string
    is valid. On failure, return -EINVAL.

    Changelog v1:
    - hex2bin now returns an int

    Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
    ---
    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 3f57795..f33804c 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))
    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-09-20 21:55    [W:0.020 / U:62.096 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site