lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.14 16/84] crypto: ecc - Fix NULL pointer deref. on no default_rng
    Date
    From: Pierre <pinaraf@pinaraf.info>

    [ Upstream commit 4c0e22c90510308433272d7ba281b1eb4eda8209 ]

    If crypto_get_default_rng returns an error, the
    function ecc_gen_privkey should return an error.
    Instead, it currently tries to use the default_rng
    nevertheless, thus creating a kernel panic with a
    NULL pointer dereference.
    Returning the error directly, as was supposedly
    intended when looking at the code, fixes this.

    Signed-off-by: Pierre Ducroquet <pinaraf@pinaraf.info>
    Reviewed-by: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    crypto/ecc.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/crypto/ecc.c b/crypto/ecc.c
    index 633a9bcdc574..18f32f2a5e1c 100644
    --- a/crypto/ecc.c
    +++ b/crypto/ecc.c
    @@ -964,7 +964,7 @@ int ecc_gen_privkey(unsigned int curve_id, unsigned int ndigits, u64 *privkey)
    * DRBG with a security strength of 256.
    */
    if (crypto_get_default_rng())
    - err = -EFAULT;
    + return -EFAULT;

    err = crypto_rng_get_bytes(crypto_default_rng, (u8 *)priv, nbytes);
    crypto_put_default_rng();
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 01:26    [W:4.117 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site