[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/9] backends/cryptodev-builtin: Fix local_error leaks
From: |
Michael Tokarev |
Subject: |
[PULL 6/9] backends/cryptodev-builtin: Fix local_error leaks |
Date: |
Mon, 29 Apr 2024 09:45:33 +0300 |
From: Li Zhijian via <qemu-devel@nongnu.org>
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: 2fda101de07 ("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>
---
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 a514bbb310..940104ee55 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;
}
@@ -554,8 +555,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.39.2
- [PULL 0/9] Trivial patches for 2024-04-29, Michael Tokarev, 2024/04/29
- [PULL 1/9] target/i386/cpu: Remove "x86" prefix from the CPU list, Michael Tokarev, 2024/04/29
- [PULL 4/9] scripts/checkpatch: Avoid author email mangled by qemu-*@nongnu.org, Michael Tokarev, 2024/04/29
- [PULL 7/9] target/loongarch/cpu.c: typo fix: expection, Michael Tokarev, 2024/04/29
- [PULL 5/9] scripts/checkpatch: Do not use mailmap, Michael Tokarev, 2024/04/29
- [PULL 8/9] target/riscv/kvm: remove sneaky strerrorname_np() instance, Michael Tokarev, 2024/04/29
- [PULL 2/9] target/s390x/cpu_models: Rework the output of "-cpu help", Michael Tokarev, 2024/04/29
- [PULL 9/9] checkpatch.pl: forbid strerrorname_np(), Michael Tokarev, 2024/04/29
- [PULL 6/9] backends/cryptodev-builtin: Fix local_error leaks,
Michael Tokarev <=
- [PULL 3/9] target/ppc/cpu_init: Remove "PowerPC" prefix from the CPU list, Michael Tokarev, 2024/04/29