From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gonglei <arei.gonglei@huawei.com>
Subject: [PATCH 01/11] cryptodev: Fix cryptodev_builtin_cleanup() error API violation
Date: Mon, 20 Apr 2020 10:32:26 +0200 [thread overview]
Message-ID: <20200420083236.19309-2-armbru@redhat.com> (raw)
In-Reply-To: <20200420083236.19309-1-armbru@redhat.com>
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.
cryptodev_builtin_cleanup() passes @errp to
cryptodev_builtin_sym_close_session() in a loop. Harmless, because
cryptodev_builtin_sym_close_session() can't actually fail. Fix it
anyway.
Cc: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
backends/cryptodev-builtin.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/backends/cryptodev-builtin.c b/backends/cryptodev-builtin.c
index c8ae3b9742..14316333fe 100644
--- a/backends/cryptodev-builtin.c
+++ b/backends/cryptodev-builtin.c
@@ -282,12 +282,7 @@ static int cryptodev_builtin_sym_close_session(
CryptoDevBackendBuiltin *builtin =
CRYPTODEV_BACKEND_BUILTIN(backend);
- if (session_id >= MAX_NUM_SESSIONS ||
- builtin->sessions[session_id] == NULL) {
- error_setg(errp, "Cannot find a valid session id: %" PRIu64 "",
- session_id);
- return -1;
- }
+ assert(session_id < MAX_NUM_SESSIONS && builtin->sessions[session_id]);
qcrypto_cipher_free(builtin->sessions[session_id]->cipher);
g_free(builtin->sessions[session_id]);
@@ -356,8 +351,7 @@ static void cryptodev_builtin_cleanup(
for (i = 0; i < MAX_NUM_SESSIONS; i++) {
if (builtin->sessions[i] != NULL) {
- cryptodev_builtin_sym_close_session(
- backend, i, 0, errp);
+ cryptodev_builtin_sym_close_session(backend, i, 0, &error_abort);
}
}
--
2.21.1
next prev parent reply other threads:[~2020-04-20 8:35 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-20 8:32 [PATCH 00/11] Miscellaneous error handling fixes Markus Armbruster
2020-04-20 8:32 ` Markus Armbruster [this message]
2020-04-20 8:32 ` [PATCH 02/11] block/file-posix: Fix check_cache_dropped() error handling Markus Armbruster
2020-04-20 15:05 ` Eric Blake
2020-04-20 8:32 ` [PATCH 03/11] cpus: Fix configure_icount() error API violation Markus Armbruster
2020-04-20 8:32 ` [PATCH 04/11] cpus: Proper range-checking for -icount shift=N Markus Armbruster
2020-04-20 8:32 ` [PATCH 05/11] arm/virt: Fix virt_machine_device_plug_cb() error API violation Markus Armbruster
2020-04-20 8:52 ` Philippe Mathieu-Daudé
2020-04-20 8:32 ` [PATCH 06/11] fdc: Fix fallback=auto error handling Markus Armbruster
2020-04-20 8:54 ` Philippe Mathieu-Daudé
2020-04-20 8:32 ` [PATCH 07/11] bochs-display: Fix vgamem=SIZE " Markus Armbruster
2020-04-20 8:54 ` Philippe Mathieu-Daudé
2020-04-20 8:32 ` [PATCH 08/11] virtio-net: Fix duplex=... and speed=... " Markus Armbruster
2020-04-20 9:04 ` Philippe Mathieu-Daudé
2020-04-20 8:32 ` [PATCH 09/11] xen/pt: Fix flawed conversion to realize() Markus Armbruster
2020-04-20 8:58 ` Paul Durrant
2020-04-20 8:32 ` [PATCH 10/11] io: Fix qio_channel_socket_close() error handling Markus Armbruster
2020-04-20 9:34 ` Daniel P. Berrangé
2020-04-20 8:32 ` [PATCH 11/11] migration/colo: Fix qmp_xen_colo_do_checkpoint() " Markus Armbruster
2020-04-20 8:48 ` Zhanghailiang
2020-04-20 8:56 ` Philippe Mathieu-Daudé
2020-04-21 0:24 ` Zhang, Chen
2020-04-20 12:57 ` [PATCH 00/11] Miscellaneous error handling fixes no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200420083236.19309-2-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=arei.gonglei@huawei.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.