From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 04/22] curl: Fix error path in curl_open()
Date: Fri, 17 Feb 2023 16:09:36 +0100 [thread overview]
Message-ID: <20230217150954.283920-4-kwolf@redhat.com> (raw)
In-Reply-To: <20230217150954.283920-1-kwolf@redhat.com>
From: Hanna Czenczek <hreitz@redhat.com>
g_hash_table_destroy() and g_hash_table_foreach_remove() (called by
curl_drop_all_sockets()) both require the table to be non-NULL, or will
print assertion failures (just print, no abort).
There are several paths in curl_open() that can lead to the out_noclean
label without s->sockets being allocated, so clean it only if it has
been allocated.
Example reproducer:
$ qemu-img info -f http ''
qemu-img: GLib: g_hash_table_foreach_remove: assertion 'hash_table != NULL' failed
qemu-img: GLib: g_hash_table_destroy: assertion 'hash_table != NULL' failed
qemu-img: Could not open '': http curl driver cannot handle the URL '' (does not start with 'http://')
Closes: https://gitlab.com/qemu-project/qemu/-/issues/1475
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
Message-Id: <20230206132949.92917-1-hreitz@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/curl.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index cbada22e9e..ba9977af5a 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -850,8 +850,10 @@ out_noclean:
g_free(s->username);
g_free(s->proxyusername);
g_free(s->proxypassword);
- curl_drop_all_sockets(s->sockets);
- g_hash_table_destroy(s->sockets);
+ if (s->sockets) {
+ curl_drop_all_sockets(s->sockets);
+ g_hash_table_destroy(s->sockets);
+ }
qemu_opts_del(opts);
return -EINVAL;
}
--
2.39.2
next prev parent reply other threads:[~2023-02-17 15:11 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-17 15:08 [PULL 00/22] Block layer patches Kevin Wolf
2023-02-17 15:09 ` [PULL 01/22] util/qemu-thread-posix: use TSA_NO_TSA to suppress clang TSA warnings in FreeBSD Kevin Wolf
2023-02-17 15:09 ` [PULL 02/22] bsd-user/mmap: " Kevin Wolf
2023-02-17 15:09 ` [PULL 03/22] configure: Enable -Wthread-safety if present Kevin Wolf
2023-02-17 15:09 ` Kevin Wolf [this message]
2023-02-17 15:09 ` [PULL 05/22] block-coroutine-wrapper: Introduce no_co_wrapper Kevin Wolf
2023-02-17 15:09 ` [PULL 06/22] block: Create no_co_wrappers for open functions Kevin Wolf
2023-02-17 15:09 ` [PULL 07/22] luks: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper Kevin Wolf
2023-02-17 15:09 ` [PULL 08/22] parallels: " Kevin Wolf
2023-02-17 15:09 ` [PULL 09/22] qcow: " Kevin Wolf
2023-02-17 15:09 ` [PULL 10/22] qcow2: Fix open/create " Kevin Wolf
2023-02-17 15:09 ` [PULL 11/22] qed: Fix .bdrv_co_create(_opts) " Kevin Wolf
2023-02-17 15:09 ` [PULL 12/22] vdi: " Kevin Wolf
2023-02-17 15:09 ` [PULL 13/22] vhdx: " Kevin Wolf
2023-02-17 15:09 ` [PULL 14/22] vmdk: " Kevin Wolf
2023-02-17 15:09 ` [PULL 15/22] vpc: " Kevin Wolf
2023-02-17 15:09 ` [PULL 16/22] block: Fix bdrv_co_create_opts_simple() " Kevin Wolf
2023-02-17 15:09 ` [PULL 17/22] block: Assert non-coroutine context for bdrv_open_inherit() Kevin Wolf
2023-02-17 15:09 ` [PULL 18/22] block: Handle curl 7.55.0, 7.85.0 version changes Kevin Wolf
2023-02-17 15:09 ` [PULL 19/22] block: temporarily hold the new AioContext of bs_top in bdrv_append() Kevin Wolf
2023-02-17 15:09 ` [PULL 20/22] MAINTAINERS: drop Vladimir from parallels block driver Kevin Wolf
2023-02-17 15:09 ` [PULL 21/22] block/file-posix: don't use functions calling AIO_WAIT_WHILE in worker threads Kevin Wolf
2023-02-17 15:09 ` [PULL 22/22] hbitmap: fix hbitmap_status() return value for first dirty bit case Kevin Wolf
2023-02-20 17:01 ` [PULL 00/22] Block layer patches Peter Maydell
2023-02-20 19:02 ` Philippe Mathieu-Daudé
2023-02-21 11:10 ` Peter Maydell
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=20230217150954.283920-4-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).