lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 201/917] crypto: aesni - check walk.nbytes instead of err
    Date
    From: Shreyansh Chouhan <chouhan.shreyansh630@gmail.com>

    [ Upstream commit a2d3cbc80d2527b435154ff0f89b56ef4b84370f ]

    In the code for xts_crypt(), we check for the err value returned by
    skcipher_walk_virt() and return from the function if it is non zero.
    However, skcipher_walk_virt() can set walk.nbytes to 0, which would cause
    us to call kernel_fpu_begin(), and then skip the kernel_fpu_end() call.

    This patch checks for the walk.nbytes value instead, and returns if
    walk.nbytes is 0. This prevents us from calling kernel_fpu_begin() in
    the first place and also covers the case of having a non zero err value
    returned from skcipher_walk_virt().

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Shreyansh Chouhan <chouhan.shreyansh630@gmail.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/x86/crypto/aesni-intel_glue.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
    index 0fc961bef299c..e09f4672dd382 100644
    --- a/arch/x86/crypto/aesni-intel_glue.c
    +++ b/arch/x86/crypto/aesni-intel_glue.c
    @@ -866,7 +866,7 @@ static int xts_crypt(struct skcipher_request *req, bool encrypt)
    req = &subreq;

    err = skcipher_walk_virt(&walk, req, false);
    - if (err)
    + if (!walk.nbytes)
    return err;
    } else {
    tail = 0;
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:34    [W:2.144 / U:0.452 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site