dccd1cb407
Update some patch for uadk_engine from mainline. Signed-off-by: Yang Shen <shenyang39@huawei.com> (cherry picked from commit 6ae4d8c0999343eddb153c4e4e879a6b66ef528f)
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From 7718ed9e56633bf2781f108a591eefe093ccb18b Mon Sep 17 00:00:00 2001
|
|
From: Kai Ye <yekai13@huawei.com>
|
|
Date: Mon, 18 Jul 2022 14:43:53 +0800
|
|
Subject: [PATCH 45/57] digest: fix the fault as using the nginx
|
|
|
|
Prevent double-free after the private ctx copy is used.
|
|
|
|
Signed-off-by: Kai Ye <yekai13@huawei.com>
|
|
---
|
|
src/uadk_digest.c | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/uadk_digest.c b/src/uadk_digest.c
|
|
index 2e61e80..8127373 100644
|
|
--- a/src/uadk_digest.c
|
|
+++ b/src/uadk_digest.c
|
|
@@ -240,6 +240,10 @@ static void digest_soft_cleanup(struct digest_priv_ctx *md_ctx)
|
|
{
|
|
EVP_MD_CTX *ctx = md_ctx->soft_ctx;
|
|
|
|
+ /* Prevent double-free after the copy is used */
|
|
+ if (md_ctx->copy)
|
|
+ return;
|
|
+
|
|
if (ctx != NULL) {
|
|
if (ctx->md_data) {
|
|
OPENSSL_free(ctx->md_data);
|
|
@@ -641,7 +645,9 @@ static int do_digest_sync(struct digest_priv_ctx *priv)
|
|
{
|
|
int ret;
|
|
|
|
- /* Fix me: not support switch the soft work as input is lower */
|
|
+ if (priv->req.in_bytes <= priv->switch_threshold &&
|
|
+ priv->state == SEC_DIGEST_INIT)
|
|
+ return 0;
|
|
|
|
ret = wd_do_digest_sync(priv->sess, &priv->req);
|
|
if (ret) {
|
|
@@ -743,6 +749,7 @@ static int uadk_e_digest_cleanup(EVP_MD_CTX *ctx)
|
|
struct digest_priv_ctx *priv =
|
|
(struct digest_priv_ctx *)EVP_MD_CTX_md_data(ctx);
|
|
|
|
+ /* Prevent double-free after the copy is used */
|
|
if (!priv || priv->copy)
|
|
return 1;
|
|
|
|
--
|
|
2.27.0
|
|
|