mirror of
https://github.com/torvalds/linux.git
synced 2026-09-24 06:24:02 +02:00
crypto: keembay - Fix AEAD unregister count in error path
register_aes_algs() registers the AEAD algorithms before registering the
skcipher algorithms. If skcipher registration fails, the function unwinds
the earlier AEAD registration with crypto_engine_unregister_aeads(), but it
passes ARRAY_SIZE(algs), which is the skcipher table size.
Use ARRAY_SIZE(algs_aead) for the AEAD unwind path so the unregister helper
iterates over the same table that was registered. Also clarify the nearby
comment: the crypto registration helpers clean up algorithms registered
within the same call, while this function must still unwind earlier
successful registration steps.
Fixes: 8857433245 ("crypto: keembay - Add support for Keem Bay OCS AES/SM4")
Co-developed-by: Ijae Kim <ae878000@gmail.com>
Signed-off-by: Ijae Kim <ae878000@gmail.com>
Signed-off-by: Myeonghun Pak <mhun512@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
ae150db782
commit
e264401ce4
|
|
@ -1541,7 +1541,7 @@ static int register_aes_algs(struct ocs_aes_dev *aes_dev)
|
|||
|
||||
/*
|
||||
* If any algorithm fails to register, all preceding algorithms that
|
||||
* were successfully registered will be automatically unregistered.
|
||||
* were registered in the same call are automatically unregistered.
|
||||
*/
|
||||
ret = crypto_engine_register_aeads(algs_aead, ARRAY_SIZE(algs_aead));
|
||||
if (ret)
|
||||
|
|
@ -1549,7 +1549,7 @@ static int register_aes_algs(struct ocs_aes_dev *aes_dev)
|
|||
|
||||
ret = crypto_engine_register_skciphers(algs, ARRAY_SIZE(algs));
|
||||
if (ret)
|
||||
crypto_engine_unregister_aeads(algs_aead, ARRAY_SIZE(algs));
|
||||
crypto_engine_unregister_aeads(algs_aead, ARRAY_SIZE(algs_aead));
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user