57 lines
2.1 KiB
Diff
57 lines
2.1 KiB
Diff
|
From 7e0e009f5e5b39fc59aaa082cc092cb6438e5842 Mon Sep 17 00:00:00 2001
|
||
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Wed, 10 Apr 2024 23:03:47 -0700
|
||
|
|
Subject: [PATCH] virtio-crypto: fix NULL pointer dereference in
|
||
|
|
virtio_crypto_free_reques
|
||
|
|
|
||
|
|
Ensure op_info is not NULL in case of QCRYPTODEV_BACKEND_ALG_SYM algtype.
|
||
|
|
|
||
|
|
Fixes: 0e660a6f90a ("crypto: Introduce RSA algorithm")
|
||
|
|
Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
|
||
|
|
Reported-by: Yiming Tao <taoym@zju.edu.cn>
|
||
|
|
Message-Id: <20230509075317.1132301-1-mcascell@redhat.com>
|
||
|
|
Reviewed-by: Gonglei <arei.gonglei@huawei.com>
|
||
|
|
Reviewed-by: zhenwei pi<pizhenwei@bytedance.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
(cherry picked from commit 3e69908907f8d3dd20d5753b0777a6e3824ba824)
|
||
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
hw/virtio/virtio-crypto.c | 20 +++++++++++---------
|
||
|
|
1 file changed, 11 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
|
||
|
|
index 61b421aab3..8c2047f4e0 100644
|
||
|
|
--- a/hw/virtio/virtio-crypto.c
|
||
|
|
+++ b/hw/virtio/virtio-crypto.c
|
||
|
|
@@ -349,15 +349,17 @@ static void virtio_crypto_free_request(VirtIOCryptoReq *req)
|
||
|
|
size_t max_len;
|
||
|
|
CryptoDevBackendSymOpInfo *op_info = req->u.sym_op_info;
|
||
|
|
|
||
|
|
- max_len = op_info->iv_len +
|
||
|
|
- op_info->aad_len +
|
||
|
|
- op_info->src_len +
|
||
|
|
- op_info->dst_len +
|
||
|
|
- op_info->digest_result_len;
|
||
|
|
-
|
||
|
|
- /* Zeroize and free request data structure */
|
||
|
|
- memset(op_info, 0, sizeof(*op_info) + max_len);
|
||
|
|
- g_free(op_info);
|
||
|
|
+ if (op_info) {
|
||
|
|
+ max_len = op_info->iv_len +
|
||
|
|
+ op_info->aad_len +
|
||
|
|
+ op_info->src_len +
|
||
|
|
+ op_info->dst_len +
|
||
|
|
+ op_info->digest_result_len;
|
||
|
|
+
|
||
|
|
+ /* Zeroize and free request data structure */
|
||
|
|
+ memset(op_info, 0, sizeof(*op_info) + max_len);
|
||
|
|
+ g_free(op_info);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
g_free(req);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|