crypto: img-hash - 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>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c
index 1dc2378aa88b4e3306dce764720dcaab9371490d..e050f5ff5efb6d5a6d26ead13a76646960caec20 100644 (file)
--- a/drivers/crypto/img-hash.c
+++ b/drivers/crypto/img-hash.c
@@ -491,8 +491,9 @@ static int img_hash_init(struct ahash_request *req)
        struct img_hash_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback);
-       rctx->fallback_req.base.flags = req->base.flags
-               & CRYPTO_TFM_REQ_MAY_SLEEP;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
 
        return crypto_ahash_init(&rctx->fallback_req);
 }
@@ -555,10 +556,10 @@ static int img_hash_update(struct ahash_request *req)
        struct img_hash_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback);
-       rctx->fallback_req.base.flags = req->base.flags
-               & CRYPTO_TFM_REQ_MAY_SLEEP;
-       rctx->fallback_req.nbytes = req->nbytes;
-       rctx->fallback_req.src = req->src;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, req->src, NULL, req->nbytes);
 
        return crypto_ahash_update(&rctx->fallback_req);
 }
@@ -570,9 +571,10 @@ static int img_hash_final(struct ahash_request *req)
        struct img_hash_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback);
-       rctx->fallback_req.base.flags = req->base.flags
-               & CRYPTO_TFM_REQ_MAY_SLEEP;
-       rctx->fallback_req.result = req->result;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, NULL, req->result, 0);
 
        return crypto_ahash_final(&rctx->fallback_req);
 }
@@ -584,11 +586,12 @@ static int img_hash_finup(struct ahash_request *req)
        struct img_hash_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback);
-       rctx->fallback_req.base.flags = req->base.flags
-               & CRYPTO_TFM_REQ_MAY_SLEEP;
-       rctx->fallback_req.nbytes = req->nbytes;
-       rctx->fallback_req.src = req->src;
-       rctx->fallback_req.result = req->result;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
+       ahash_request_set_crypt(&rctx->fallback_req, req->src, req->result,
+                               req->nbytes);
+
 
        return crypto_ahash_finup(&rctx->fallback_req);
 }
@@ -600,8 +603,9 @@ static int img_hash_import(struct ahash_request *req, const void *in)
        struct img_hash_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback);
-       rctx->fallback_req.base.flags = req->base.flags
-               & CRYPTO_TFM_REQ_MAY_SLEEP;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
 
        return crypto_ahash_import(&rctx->fallback_req, in);
 }
@@ -613,8 +617,9 @@ static int img_hash_export(struct ahash_request *req, void *out)
        struct img_hash_ctx *ctx = crypto_ahash_ctx(tfm);
 
        ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback);
-       rctx->fallback_req.base.flags = req->base.flags
-               & CRYPTO_TFM_REQ_MAY_SLEEP;
+       ahash_request_set_callback(&rctx->fallback_req,
+                                  req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  req->base.complete, req->base.data);
 
        return crypto_ahash_export(&rctx->fallback_req, out);
 }