Commit cbc9f5bc authored by Ovidiu Panait's avatar Ovidiu Panait Committed by Herbert Xu
Browse files

crypto: rk3288 - 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: default avatarOvidiu Panait <ovidiu.panait.oss@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2f0c856a

drivers/crypto/rockchip/rk3288_crypto_ahash.c

+27 −25
Original line number Diff line number Diff line
@@ -52,12 +52,11 @@ static int rk_ahash_digest_fb(struct ahash_request *areq) 
	algt->stat_fb++;



	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);



	return crypto_ahash_digest(&rctx->fallback_req);

}
@@ -124,8 +123,9 @@ static int rk_ahash_init(struct ahash_request *req) 
	struct rk_ahash_ctx *ctx = crypto_ahash_ctx(tfm);



	ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);

	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);

}
@@ -137,10 +137,10 @@ static int rk_ahash_update(struct ahash_request *req) 
	struct rk_ahash_ctx *ctx = crypto_ahash_ctx(tfm);



	ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);

	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);

}
@@ -152,9 +152,10 @@ static int rk_ahash_final(struct ahash_request *req) 
	struct rk_ahash_ctx *ctx = crypto_ahash_ctx(tfm);



	ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);

	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);

}
@@ -166,12 +167,11 @@ static int rk_ahash_finup(struct ahash_request *req) 
	struct rk_ahash_ctx *ctx = crypto_ahash_ctx(tfm);



	ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);

	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);

}
@@ -183,8 +183,9 @@ static int rk_ahash_import(struct ahash_request *req, const void *in) 
	struct rk_ahash_ctx *ctx = crypto_ahash_ctx(tfm);



	ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);

	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);

}
@@ -196,8 +197,9 @@ static int rk_ahash_export(struct ahash_request *req, void *out) 
	struct rk_ahash_ctx *ctx = crypto_ahash_ctx(tfm);



	ahash_request_set_tfm(&rctx->fallback_req, ctx->fallback_tfm);

	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);

}