132 lines
5.2 KiB
Diff
132 lines
5.2 KiB
Diff
From 84ffde44e62f1991a6908f9bb5aba06aad2d7dda Mon Sep 17 00:00:00 2001
|
|
From: Vladislav Dronov <vdronov@redhat.com>
|
|
Date: Sun, 7 Jun 2026 23:27:48 +0200
|
|
Subject: [PATCH] crypto: tegra - use API helpers to setup fallback request
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-182565
|
|
Upstream Status: merged into the upstream linux.git
|
|
|
|
commit c1024581ff2c34db4fdfe857b29f606e5117eb12
|
|
Author: Ovidiu Panait <ovidiu.panait.oss@gmail.com>
|
|
Date: Mon Apr 7 15:36:04 2025 +0300
|
|
|
|
crypto: tegra - 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.
|
|
|
|
Signed-off-by: Ovidiu Panait <ovidiu.panait.oss@gmail.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
|
|
Signed-off-by: Vladislav Dronov <vdronov@redhat.com>
|
|
|
|
diff --git a/drivers/crypto/tegra/tegra-se-hash.c b/drivers/crypto/tegra/tegra-se-hash.c
|
|
index 90bf34eb3578..e3fe5911a324 100644
|
|
--- a/drivers/crypto/tegra/tegra-se-hash.c
|
|
+++ b/drivers/crypto/tegra/tegra-se-hash.c
|
|
@@ -118,8 +118,9 @@ static int tegra_sha_fallback_init(struct ahash_request *req)
|
|
struct tegra_sha_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);
|
|
}
|
|
@@ -131,10 +132,10 @@ static int tegra_sha_fallback_update(struct ahash_request *req)
|
|
struct tegra_sha_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);
|
|
}
|
|
@@ -146,9 +147,10 @@ static int tegra_sha_fallback_final(struct ahash_request *req)
|
|
struct tegra_sha_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);
|
|
}
|
|
@@ -160,12 +162,11 @@ static int tegra_sha_fallback_finup(struct ahash_request *req)
|
|
struct tegra_sha_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);
|
|
}
|
|
@@ -177,12 +178,11 @@ static int tegra_sha_fallback_digest(struct ahash_request *req)
|
|
struct tegra_sha_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_digest(&rctx->fallback_req);
|
|
}
|
|
@@ -194,8 +194,9 @@ static int tegra_sha_fallback_import(struct ahash_request *req, const void *in)
|
|
struct tegra_sha_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);
|
|
}
|
|
@@ -207,8 +208,9 @@ static int tegra_sha_fallback_export(struct ahash_request *req, void *out)
|
|
struct tegra_sha_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);
|
|
}
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|