Commit f4077646 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: x86/ghash - Use proper helpers to clone request 



Rather than copying a request by hand with memcpy, use the correct
API helpers to setup the new request.  This will matter once the
API helpers start setting up chained requests as a simple memcpy
will break chaining.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 075db214

arch/x86/crypto/ghash-clmulni-intel_glue.c

+17 −6
Original line number Diff line number Diff line
@@ -189,6 +189,20 @@ static int ghash_async_init(struct ahash_request *req) 
	return crypto_shash_init(desc);

}



static void ghash_init_cryptd_req(struct ahash_request *req)

{

	struct ahash_request *cryptd_req = ahash_request_ctx(req);

	struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);

	struct ghash_async_ctx *ctx = crypto_ahash_ctx(tfm);

	struct cryptd_ahash *cryptd_tfm = ctx->cryptd_tfm;



	ahash_request_set_tfm(cryptd_req, &cryptd_tfm->base);

	ahash_request_set_callback(cryptd_req, req->base.flags,

				   req->base.complete, req->base.data);

	ahash_request_set_crypt(cryptd_req, req->src, req->result,

				req->nbytes);

}



static int ghash_async_update(struct ahash_request *req)

{

	struct ahash_request *cryptd_req = ahash_request_ctx(req);
@@ -198,8 +212,7 @@ static int ghash_async_update(struct ahash_request *req) 


	if (!crypto_simd_usable() ||

	    (in_atomic() && cryptd_ahash_queued(cryptd_tfm))) {

		memcpy(cryptd_req, req, sizeof(*req));

		ahash_request_set_tfm(cryptd_req, &cryptd_tfm->base);

		ghash_init_cryptd_req(req);

		return crypto_ahash_update(cryptd_req);

	} else {

		struct shash_desc *desc = cryptd_shash_desc(cryptd_req);
@@ -216,8 +229,7 @@ static int ghash_async_final(struct ahash_request *req) 


	if (!crypto_simd_usable() ||

	    (in_atomic() && cryptd_ahash_queued(cryptd_tfm))) {

		memcpy(cryptd_req, req, sizeof(*req));

		ahash_request_set_tfm(cryptd_req, &cryptd_tfm->base);

		ghash_init_cryptd_req(req);

		return crypto_ahash_final(cryptd_req);

	} else {

		struct shash_desc *desc = cryptd_shash_desc(cryptd_req);
@@ -257,8 +269,7 @@ static int ghash_async_digest(struct ahash_request *req) 


	if (!crypto_simd_usable() ||

	    (in_atomic() && cryptd_ahash_queued(cryptd_tfm))) {

		memcpy(cryptd_req, req, sizeof(*req));

		ahash_request_set_tfm(cryptd_req, &cryptd_tfm->base);

		ghash_init_cryptd_req(req);

		return crypto_ahash_digest(cryptd_req);

	} else {

		struct shash_desc *desc = cryptd_shash_desc(cryptd_req);