lkml.org 
[lkml]   [2019]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 012/144] crypto: ccp - Fix oops by properly managing allocated structures
    Date
    From: Gary R Hook <gary.hook@amd.com>

    commit 25e44338321af545ab34243a6081c3f0fc6107d0 upstream.

    A plaintext or ciphertext length of 0 is allowed in AES, in which case
    no encryption occurs. Ensure that we don't clean up data structures
    that were never allocated.

    Fixes: 36cf515b9bbe2 ("crypto: ccp - Enable support for AES GCM on v5 CCPs")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Gary R Hook <gary.hook@amd.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/crypto/ccp/ccp-ops.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/crypto/ccp/ccp-ops.c
    +++ b/drivers/crypto/ccp/ccp-ops.c
    @@ -859,11 +859,11 @@ e_tag:
    ccp_dm_free(&final_wa);

    e_dst:
    - if (aes->src_len && !in_place)
    + if (ilen > 0 && !in_place)
    ccp_free_data(&dst, cmd_q);

    e_src:
    - if (aes->src_len)
    + if (ilen > 0)
    ccp_free_data(&src, cmd_q);

    e_aad:

    \
     
     \ /
      Last update: 2019-08-14 19:55    [W:6.946 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site