lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 045/111] crypto: sharah - Unregister correct algorithms for SAHARA 3
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Michael Müller <michael@fds-team.de>

    [ Upstream commit 0e7d4d932ffc23f75efb31a8c2ac2396c1b81c55 ]

    This patch fixes two typos related to unregistering algorithms supported by
    SAHARAH 3. In sahara_register_algs the wrong algorithms are unregistered
    in case of an error. In sahara_unregister_algs the wrong array is used to
    determine the iteration count.

    Signed-off-by: Michael Müller <michael@fds-team.de>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/crypto/sahara.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/crypto/sahara.c
    +++ b/drivers/crypto/sahara.c
    @@ -1352,7 +1352,7 @@ err_sha_v4_algs:

    err_sha_v3_algs:
    for (j = 0; j < k; j++)
    - crypto_unregister_ahash(&sha_v4_algs[j]);
    + crypto_unregister_ahash(&sha_v3_algs[j]);

    err_aes_algs:
    for (j = 0; j < i; j++)
    @@ -1368,7 +1368,7 @@ static void sahara_unregister_algs(struc
    for (i = 0; i < ARRAY_SIZE(aes_algs); i++)
    crypto_unregister_alg(&aes_algs[i]);

    - for (i = 0; i < ARRAY_SIZE(sha_v4_algs); i++)
    + for (i = 0; i < ARRAY_SIZE(sha_v3_algs); i++)
    crypto_unregister_ahash(&sha_v3_algs[i]);

    if (dev->version > SAHARA_VERSION_3)

    \
     
     \ /
      Last update: 2018-09-24 14:03    [W:4.115 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site