4f059b938c
- hw/loongarch/virt: Fix FDT memory node address width - hw/loongarch: Fix fdt memory node wrong 'reg' - load_elf: fix iterator's type for elf file processing - migration/colo: Fix bdrv_graph_rdlock_main_loop: Assertion `!qemu_in_… - target/i386: no single-step exception after MOV or POP SS - char-stdio: Restore blocking mode of stdout on exit - backends/cryptodev-builtin: Fix local_error leaks - target/loongarch: fix a wrong print in cpu dump - virtio-pci: fix use of a released vector - target/arm: Disable SVE extensions when SVE is disabled - hw/misc/bcm2835_property: Fix handling of FRAMEBUFFER_SET_PALETTE - target/i386: Introduce SapphireRapids-v3 to add missing features - virtio-net: Ensure queue index fits with RSS (CVE-2024-6505) - nbd/server: CVE-2024-7409: Avoid use-after-free when closing server - update io/trace-events. Parameters should remain consistent. - update docs/tools/virtfs-proxy-helper.rst. This place is spelled wrong. - kvm: Add support for CSV2 reboot - target/i386/kvm: Fix the resettable info when emulate Hygon CSV2 guest - target/i386: get/set/migrate GHCB state - target/i386: csv: Add support for migrate VMSA for CSV2 guest - migration/ram: Accelerate the loading of CSV guest's encrypted pages - migration/ram: Accelerate the transmission of CSV guest's encrypted pages - target/i386: csv: add support to load incoming encrypted pages queued in the CMD list - target/i386: csv: add support to queue the incoming page into a list - target/i386: csv: add support to encrypt the outgoing pages in the list queued before. - target/i386: csv: add support to queue the outgoing page into a list - target/i386: csv: Read cert chain from file when prepared for CSV live migration - target/i386: Introduce header file csv.h - migration/ram: Fix calculation of gfn correpond to a page in ramblock - target/i386: sev: Clear shared_regions_list when reboot CSV Guest - migration/ram: Force encrypted status for VGA vram - target/i386: sev: Return 0 if sev_send_get_packet_len() fails - kvm: Add support for userspace MSR filtering and handling of MSR_KVM_MIGRATION_CONTROL. - migration/ram: Force encrypted status for flash0 & flash1 devices. - migration/ram: add support to send encrypted pages - migration: add support to migrate shared regions list - kvm: Add support for SEV shared regions list and KVM_EXIT_HYPERCALL. - target/i386: sev: add support to load incoming encrypted page - target/i386: sev: add support to encrypt the outgoing page - target/i386: sev: do not create launch context for an incoming guest - target/i386: sev: provide callback to setup outgoing context - confidential guest support: introduce ConfidentialGuestMemoryEncryptionOps for encrypted VMs - migration.json: add AMD SEV specific migration parameters - doc: update AMD SEV to include Live migration flow - crypto/tlscredspsk: Free username on finalize - hw/nvme: fix leak of uninitialized memory in io_mgmt_recv - hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read() - cvm : Implement command blacklist for cvm security enhancement - crypto: Introduce SM3 hash hmac pbkdf algorithm - virtio-net: Use virtual time for RSC timers - vvfat: Fix bug in writing to middle of file - hw/core/ptimer: fix timer zero period condition for freq > 1GHz - hw/misc: support vpsp Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
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
|
|
|