64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
|
From 2781f5673cc43d13b73e66fb266e7ea0b945429d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gao Jiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Thu, 12 Sep 2024 20:55:38 +0800
|
||
|
|
Subject: [PATCH] backends/cryptodev-builtin: Fix local_error leaks
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cherry picked from commit 06479dbf3d7d245572c4b3016e5a1d923ff04d66
|
||
|
|
|
||
|
|
backends/cryptodev-builtin: Fix local_error leaks
|
||
|
|
It seems that this error does not need to be propagated to the upper,
|
||
|
|
directly output the error to avoid the leaks
|
||
|
|
|
||
|
|
Closes: https://gitlab.com/qemu-project/qemu/-/issues/2283
|
||
|
|
Fixes: 2fda101 ("virtio-crypto: Support asynchronous mode")
|
||
|
|
Signed-off-by: Li Zhijian <lizhijian@fujitsu.com>
|
||
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
||
|
|
Reviewed-by: zhenwei pi <pizhenwei@bytedance.com>
|
||
|
|
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
|
||
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
||
|
|
Signed-off-by: Gao Jiazhen <gaojiazhen_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
backends/cryptodev-builtin.c | 9 +++++----
|
||
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/backends/cryptodev-builtin.c b/backends/cryptodev-builtin.c
|
||
|
|
index 39d0455280..0822f198d9 100644
|
||
|
|
--- a/backends/cryptodev-builtin.c
|
||
|
|
+++ b/backends/cryptodev-builtin.c
|
||
|
|
@@ -23,6 +23,7 @@
|
||
|
|
|
||
|
|
#include "qemu/osdep.h"
|
||
|
|
#include "sysemu/cryptodev.h"
|
||
|
|
+#include "qemu/error-report.h"
|
||
|
|
#include "qapi/error.h"
|
||
|
|
#include "standard-headers/linux/virtio_crypto.h"
|
||
|
|
#include "crypto/cipher.h"
|
||
|
|
@@ -396,8 +397,8 @@ static int cryptodev_builtin_create_session(
|
||
|
|
case VIRTIO_CRYPTO_HASH_CREATE_SESSION:
|
||
|
|
case VIRTIO_CRYPTO_MAC_CREATE_SESSION:
|
||
|
|
default:
|
||
|
|
- error_setg(&local_error, "Unsupported opcode :%" PRIu32 "",
|
||
|
|
- sess_info->op_code);
|
||
|
|
+ error_report("Unsupported opcode :%" PRIu32 "",
|
||
|
|
+ sess_info->op_code);
|
||
|
|
return -VIRTIO_CRYPTO_NOTSUPP;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -552,8 +553,8 @@ static int cryptodev_builtin_operation(
|
||
|
|
|
||
|
|
if (op_info->session_id >= MAX_NUM_SESSIONS ||
|
||
|
|
builtin->sessions[op_info->session_id] == NULL) {
|
||
|
|
- error_setg(&local_error, "Cannot find a valid session id: %" PRIu64 "",
|
||
|
|
- op_info->session_id);
|
||
|
|
+ error_report("Cannot find a valid session id: %" PRIu64 "",
|
||
|
|
+ op_info->session_id);
|
||
|
|
return -VIRTIO_CRYPTO_INVSESS;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|