crypto: sun8i-ss - use API helpers to setup fallback request

Rather than setting up the fallback request by hand, use
ahash_request_set_callback() and ahash_request_set_crypt() API helpers
to properly setup the new request.

This also ensures that the completion callback is properly passed down
to the fallback algorithm, which avoids a crash with async fallbacks.

Signed-off-by: Ovidiu Panait <ovidiu.panait.oss@gmail.com>
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
index 753f67a36dc505a2ea05f577fccc5ab273d068f6..8bc08089f044fec15c8c49ee70e2b0744e96da3a 100644 (file)
--- a/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
+++ b/drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c
@@ -150,7 +150,9 @@ int sun8i_ss_hash_init(struct ahash_request *areq)
        memset(rctx, 0, sizeof(struct sun8i_ss_hash_reqctx));
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
-       rctx->fallback_req.base.flags = areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  areq->base.complete, areq->base.data);
 
        return crypto_ahash_init(&rctx->fallback_req);
 }
@@ -162,7 +164,9 @@ int sun8i_ss_hash_export(struct ahash_request *areq, void *out)
        struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
-       rctx->fallback_req.base.flags = areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  areq->base.complete, areq->base.data);
 
        return crypto_ahash_export(&rctx->fallback_req, out);
 }
@@ -174,7 +178,9 @@ int sun8i_ss_hash_import(struct ahash_request *areq, const void *in)
        struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
-       rctx->fallback_req.base.flags = areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  areq->base.complete, areq->base.data);
 
        return crypto_ahash_import(&rctx->fallback_req, in);
 }
@@ -186,9 +192,10 @@ int sun8i_ss_hash_final(struct ahash_request *areq)
        struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
-       rctx->fallback_req.base.flags = areq->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
-       rctx->fallback_req.result = areq->result;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  areq->base.complete, areq->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, NULL, areq->result, 0);
 
        if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG)) {
                struct ahash_alg *alg = crypto_ahash_alg(tfm);
@@ -212,10 +219,10 @@ int sun8i_ss_hash_update(struct ahash_request *areq)
        struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
-       rctx->fallback_req.base.flags = areq->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
-       rctx->fallback_req.nbytes = areq->nbytes;
-       rctx->fallback_req.src = areq->src;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  areq->base.complete, areq->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, areq->src, NULL, areq->nbytes);
 
        return crypto_ahash_update(&rctx->fallback_req);
 }
@@ -227,12 +234,11 @@ int sun8i_ss_hash_finup(struct ahash_request *areq)
        struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
-       rctx->fallback_req.base.flags = areq->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
-
-       rctx->fallback_req.nbytes = areq->nbytes;
-       rctx->fallback_req.src = areq->src;
-       rctx->fallback_req.result = areq->result;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  areq->base.complete, areq->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, areq->src, areq->result,
+                               areq->nbytes);
 
        if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG)) {
                struct ahash_alg *alg = crypto_ahash_alg(tfm);
@@ -256,12 +262,11 @@ static int sun8i_ss_hash_digest_fb(struct ahash_request *areq)
        struct sun8i_ss_hash_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, tfmctx->fallback_tfm);
-       rctx->fallback_req.base.flags = areq->base.flags &
-                                       CRYPTO_TFM_REQ_MAY_SLEEP;
-
-       rctx->fallback_req.nbytes = areq->nbytes;
-       rctx->fallback_req.src = areq->src;
-       rctx->fallback_req.result = areq->result;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  areq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  areq->base.complete, areq->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, areq->src, areq->result,
+                               areq->nbytes);
 
        if (IS_ENABLED(CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG)) {
                struct ahash_alg *alg = crypto_ahash_alg(tfm);