From: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
commit e80cf84b608725303113d6fe98bb727bf7b7a40d upstream.
If we encounter an error when registering alorithms with the crypto
framework, we just bail out and don't unregister the ones we
successfully registered in prior iterations of the loop.
Add code that goes back over the algos and unregisters them before
returning an error from qce_register_algs().
Cc: stable@xxxxxxxxxxxxxxx
Fixes: ec8f5d8f6f76 ("crypto: qce - Qualcomm crypto engine driver")
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@xxxxxxxxxx>
Reviewed-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/crypto/qce/core.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
--- a/drivers/crypto/qce/core.c
+++ b/drivers/crypto/qce/core.c
@@ -51,16 +51,19 @@ static void qce_unregister_algs(struct q
static int qce_register_algs(struct qce_device *qce)
{
const struct qce_algo_ops *ops;
- int i, ret = -ENODEV;
+ int i, j, ret = -ENODEV;
for (i = 0; i < ARRAY_SIZE(qce_ops); i++) {
ops = qce_ops[i];
ret = ops->register_algs(qce);
- if (ret)
- break;
+ if (ret) {
+ for (j = i - 1; j >= 0; j--)
+ ops->unregister_algs(qce);
+ return ret;
+ }
}
- return ret;
+ return 0;
}
static int qce_handle_request(struct crypto_async_request *async_req)
Patches currently in stable-queue which might be from bartosz.golaszewski@xxxxxxxxxx are
queue-6.13/gpio-gpio_grgpio-should-depend-on-of.patch
queue-6.13/gpio-pca953x-improve-interrupt-support.patch
queue-6.13/crypto-qce-fix-priority-to-be-less-than-armv8-ce.patch
queue-6.13/gpio-sim-lock-hog-configfs-items-if-present.patch
queue-6.13/crypto-qce-unregister-previously-registered-algos-in-error-path.patch
queue-6.13/firmware-qcom-scm-fix-missing-read-barrier-in-qcom_scm_is_available.patch
queue-6.13/crypto-qce-fix-goto-jump-in-error-path.patch
