lkml.org 
[lkml]   [2017]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 38/41] KEYS: Fix an error code in request_master_key()
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit 57cb17e764ba0aaa169d07796acce54ccfbc6cae upstream.

    This function has two callers and neither are able to handle a NULL
    return. Really, -EINVAL is the correct thing return here anyway. This
    fixes some static checker warnings like:

    security/keys/encrypted-keys/encrypted.c:709 encrypted_key_decrypt()
    error: uninitialized symbol 'master_key'.

    Fixes: 7e70cb497850 ("keys: add new key-type encrypted")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
    Signed-off-by: James Morris <james.l.morris@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    security/keys/encrypted-keys/encrypted.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/security/keys/encrypted-keys/encrypted.c
    +++ b/security/keys/encrypted-keys/encrypted.c
    @@ -437,7 +437,7 @@ static struct skcipher_request *init_skc
    static struct key *request_master_key(struct encrypted_key_payload *epayload,
    const u8 **master_key, size_t *master_keylen)
    {
    - struct key *mkey = NULL;
    + struct key *mkey = ERR_PTR(-EINVAL);

    if (!strncmp(epayload->master_desc, KEY_TRUSTED_PREFIX,
    KEY_TRUSTED_PREFIX_LEN)) {

    \
     
     \ /
      Last update: 2017-07-10 19:18    [W:4.040 / U:0.432 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site