crypto: hash - Simplify the ahash_finup implementation (d4a7a0fb) · Commits · 戴 / test

The ahash_def_finup() can make use of the request save/restore functions, thus make it so. This simplifies the code a little and unifies the code paths. Note that the same remark about free()ing the req->priv applies here, the req->priv can only be free()'d after the original request was restored. Finally, squash a bug in the invocation of completion in the ASYNC path. In both ahash_def_finup_done{1,2}, the function areq->base.complete(X, err); was called with X=areq->base.data . This is incorrect , as X=&areq->base is the correct value. By analysis of the data structures, we see the areq is of type 'struct ahash_request' , areq->base is of type 'struct crypto_async_request' and areq->base.completion is of type crypto_completion_t, which is defined in include/linux/crypto.h as: typedef void (*crypto_completion_t)(struct crypto_async_request *req, int err); This is one lead that the X should be &areq->base . Next up, we can inspect other code which calls the completion callback to give us kind-of statistical idea of how this callback is used. We can try: $ git grep base\.complete\( drivers/crypto/ Finally, by inspecting ahash_request_set_callback() implementation defined in include/crypto/hash.h , we observe that the .data entry of 'struct crypto_async_request' is intended for arbitrary data, not for completion argument. Signed-off-by:

Marek Vasut <marex@denx.de> Cc: David S. Miller <davem@davemloft.net> Cc: Fabio Estevam <fabio.estevam@freescale.com> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Shawn Guo <shawn.guo@linaro.org> Cc: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by:

Herbert Xu <herbert@gondor.apana.org.au>

crypto/ahash.c

+9 −27

Original line number	Diff line number	Diff line
		@@ -349,19 +349,16 @@ static void ahash_def_finup_finish2(struct ahash_request *req, int err)
		memcpy(priv->result, req->result,
		crypto_ahash_digestsize(crypto_ahash_reqtfm(req)));

		kzfree(priv);
		ahash_restore_req(req);
		}

		static void ahash_def_finup_done2(struct crypto_async_request *req, int err)
		{
		struct ahash_request *areq = req->data;
		struct ahash_request_priv *priv = areq->priv;
		crypto_completion_t complete = priv->complete;
		void *data = priv->data;

		ahash_def_finup_finish2(areq, err);

		complete(data, err);
		areq->base.complete(&areq->base, err);
		}

		static int ahash_def_finup_finish1(struct ahash_request *req, int err)
		@@ -381,38 +378,23 @@ out:
		static void ahash_def_finup_done1(struct crypto_async_request *req, int err)
		{
		struct ahash_request *areq = req->data;
		struct ahash_request_priv *priv = areq->priv;
		crypto_completion_t complete = priv->complete;
		void *data = priv->data;

		err = ahash_def_finup_finish1(areq, err);

		complete(data, err);
		areq->base.complete(&areq->base, err);
		}

		static int ahash_def_finup(struct ahash_request *req)
		{
		struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
		unsigned long alignmask = crypto_ahash_alignmask(tfm);
		unsigned int ds = crypto_ahash_digestsize(tfm);
		struct ahash_request_priv *priv;

		priv = kmalloc(sizeof(*priv) + ahash_align_buffer_size(ds, alignmask),
		(req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ?
		GFP_KERNEL : GFP_ATOMIC);
		if (!priv)
		return -ENOMEM;

		priv->result = req->result;
		priv->complete = req->base.complete;
		priv->data = req->base.data;
		int err;

		req->result = PTR_ALIGN((u8 *)priv->ubuf, alignmask + 1);
		req->base.complete = ahash_def_finup_done1;
		req->base.data = req;
		req->priv = priv;
		err = ahash_save_req(req, ahash_def_finup_done1);
		if (err)
		return err;

		return ahash_def_finup_finish1(req, tfm->update(req));
		err = tfm->update(req);
		return ahash_def_finup_finish1(req, err);
		}

		static int ahash_no_export(struct ahash_request req, void out)

Admin message