OSDN Git Service

crypto: sharah - Unregister correct algorithms for SAHARA 3
authorMichael Müller <michael@fds-team.de>
Sat, 14 Jul 2018 22:27:06 +0000 (00:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Sep 2018 06:39:29 +0000 (08:39 +0200)
[ 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

index 0f2245e..97d86dc 100644 (file)
@@ -1351,7 +1351,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++)
@@ -1367,7 +1367,7 @@ static void sahara_unregister_algs(struct sahara_dev *dev)
        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)