lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 114/244] keys: asymmetric: fix error return code in software_key_query()
    Date
    From: Wei Yongjun <weiyongjun1@huawei.com>

    [ Upstream commit 6cbba1f9114a8134cff9138c79add15012fd52b9 ]

    Fix to return negative error code -ENOMEM from kmalloc() error handling
    case instead of 0, as done elsewhere in this function.

    Fixes: f1774cb8956a ("X.509: parse public key parameters from x509 for akcipher")
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    crypto/asymmetric_keys/public_key.c | 1 +
    1 file changed, 1 insertion(+)

    diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c
    index d7f43d4ea925a..e5fae4e838c06 100644
    --- a/crypto/asymmetric_keys/public_key.c
    +++ b/crypto/asymmetric_keys/public_key.c
    @@ -119,6 +119,7 @@ static int software_key_query(const struct kernel_pkey_params *params,
    if (IS_ERR(tfm))
    return PTR_ERR(tfm);

    + ret = -ENOMEM;
    key = kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen,
    GFP_KERNEL);
    if (!key)
    --
    2.25.1


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