From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, berrange@redhat.com, zxq_yx_007@163.com,
kraxel@redhat.com, pbonzini@redhat.com,
marcandre.lureau@redhat.com
Subject: [PATCH 07/11] sockets: Fix default of UnixSocketAddress member @tight
Date: Thu, 29 Oct 2020 14:38:29 +0100 [thread overview]
Message-ID: <20201029133833.3450220-8-armbru@redhat.com> (raw)
In-Reply-To: <20201029133833.3450220-1-armbru@redhat.com>
QMP chardev-add defaults absent member @tight to false instead of
true. HMP chardev-add and CLI -chardev correctly default to true.
The previous commit demonstrated that socket_listen() and
socket_connect() are broken for absent @tight. That explains why QMP
is broken, but not why HMP and CLI work. We need to dig deeper.
An optional bool member of a QAPI struct can be false, true, or
absent. In C, we have:
has_MEMBER MEMBER
false true false
true true false
absent false false/ignore
When has_MEMBER is false, MEMBER should be set to false on write, and
ignored on read.
unix_listen_saddr() and unix_connect_saddr() use member @tight without
checking @has_tight. This is wrong.
When @tight was set to false as it should be, absent @tight defaults
to false. Wrong, it should default to true. This is what breaks QMP.
There is one exception: qemu_chr_parse_socket() leaves @has_tight
false when it sets @tight. Wrong, but the wrongs cancel out. This is
why HMP and CLI work. Same for @has_abstract.
Fix unix_listen_saddr() and unix_connect_saddr() to default absent
@tight to true.
Fix qemu_chr_parse_socket() to set @has_tight and @has_abstract.
Fixes: 776b97d3605ed0fc94443048fdf988c7725e38a9
Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
chardev/char-socket.c | 2 ++
tests/test-util-sockets.c | 6 +++---
util/qemu-sockets.c | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 95e45812d5..1ee5a8c295 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1439,7 +1439,9 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX;
q_unix = addr->u.q_unix.data = g_new0(UnixSocketAddress, 1);
q_unix->path = g_strdup(path);
+ q_unix->has_tight = true;
q_unix->tight = tight;
+ q_unix->has_abstract = true;
q_unix->abstract = abstract;
} else if (host) {
addr->type = SOCKET_ADDRESS_LEGACY_KIND_INET;
diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c
index f8b6586e70..7ecf95579b 100644
--- a/tests/test-util-sockets.c
+++ b/tests/test-util-sockets.c
@@ -294,13 +294,13 @@ static void test_socket_unix_abstract(void)
abstract_socket_matrix_row matrix[ABSTRACT_SOCKET_VARIANTS] = {
{ &addr,
{ &addr_tight, &addr_padded, &addr },
- { false /* BUG */, true /* BUG */, true } },
+ { true, false, true } },
{ &addr_tight,
{ &addr_padded, &addr, &addr_tight },
- { false, false /* BUG */, true } },
+ { false, true, true } },
{ &addr_padded,
{ &addr, &addr_tight, &addr_padded },
- { true /* BUG */, false, true } }
+ { false, false, true } }
};
int i;
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 05e5c73f9d..c802d5aa0a 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -919,7 +919,7 @@ static int unix_listen_saddr(UnixSocketAddress *saddr,
if (saddr->abstract) {
un.sun_path[0] = '\0';
memcpy(&un.sun_path[1], path, pathlen);
- if (saddr->tight) {
+ if (!saddr->has_tight || saddr->tight) {
addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + pathlen;
}
} else {
@@ -979,7 +979,7 @@ static int unix_connect_saddr(UnixSocketAddress *saddr, Error **errp)
if (saddr->abstract) {
un.sun_path[0] = '\0';
memcpy(&un.sun_path[1], saddr->path, pathlen);
- if (saddr->tight) {
+ if (!saddr->has_tight || saddr->tight) {
addrlen = offsetof(struct sockaddr_un, sun_path) + 1 + pathlen;
}
} else {
--
2.26.2
next prev parent reply other threads:[~2020-10-29 13:46 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 13:38 [PATCH 00/11] sockets: Attempt to drain the abstract socket swamp Markus Armbruster
2020-10-29 13:38 ` [PATCH 01/11] test-util-sockets: Plug file descriptor leak Markus Armbruster
2020-10-29 17:59 ` Eric Blake
2020-10-29 13:38 ` [PATCH 02/11] test-util-sockets: Correct to set has_abstract, has_tight Markus Armbruster
2020-10-29 18:36 ` Eric Blake
2020-10-29 13:38 ` [PATCH 03/11] test-util-sockets: Clean up SocketAddress construction Markus Armbruster
2020-10-29 18:43 ` Eric Blake
2020-10-30 9:36 ` Daniel P. Berrangé
2020-10-30 14:06 ` Markus Armbruster
2020-10-29 13:38 ` [PATCH 04/11] test-util-sockets: Factor out test_socket_unix_abstract_one() Markus Armbruster
2020-10-29 18:52 ` Eric Blake
2020-10-29 13:38 ` [PATCH 05/11] test-util-sockets: Synchronize properly, don't sleep(1) Markus Armbruster
2020-10-29 18:54 ` Eric Blake
2020-10-30 6:40 ` Markus Armbruster
2020-10-29 13:38 ` [PATCH 06/11] test-util-sockets: Test the complete abstract socket matrix Markus Armbruster
2020-10-29 19:19 ` Eric Blake
2020-10-30 9:33 ` Daniel P. Berrangé
2020-10-30 14:14 ` Markus Armbruster
2020-10-29 13:38 ` Markus Armbruster [this message]
2020-10-29 17:39 ` [PATCH 07/11] sockets: Fix default of UnixSocketAddress member @tight Paolo Bonzini
2020-10-29 18:05 ` Paolo Bonzini
2020-10-30 6:58 ` Markus Armbruster
2020-10-29 19:34 ` Eric Blake
2020-10-30 6:54 ` Markus Armbruster
2020-10-29 13:38 ` [PATCH 08/11] sockets: Fix socket_sockaddr_to_address_unix() for abstract sockets Markus Armbruster
2020-10-29 17:47 ` Paolo Bonzini
2020-10-30 8:56 ` Markus Armbruster
2020-10-29 19:38 ` Eric Blake
2020-10-30 9:04 ` Markus Armbruster
2020-10-30 12:39 ` Eric Blake
2020-10-29 13:38 ` [PATCH 09/11] char-socket: Fix qemu_chr_socket_address() " Markus Armbruster
2020-10-29 19:41 ` Eric Blake
2020-10-30 9:09 ` Markus Armbruster
2020-10-29 13:38 ` [PATCH 10/11] sockets: Bypass "replace empty @path" for abstract unix sockets Markus Armbruster
2020-10-29 19:42 ` Eric Blake
2020-10-29 13:38 ` [PATCH 11/11] sockets: Make abstract UnixSocketAddress depend on CONFIG_LINUX Markus Armbruster
2020-10-29 19:54 ` Eric Blake
2020-10-30 9:25 ` Markus Armbruster
2020-10-29 13:53 ` [PATCH 00/11] sockets: Attempt to drain the abstract socket swamp Marc-André Lureau
2020-10-30 10:11 ` Markus Armbruster
2020-10-30 10:20 ` Daniel P. Berrangé
2020-11-02 8:44 ` Markus Armbruster
2020-11-02 8:57 ` Paolo Bonzini
2020-11-02 9:18 ` Daniel P. Berrangé
2020-11-02 9:59 ` Markus Armbruster
2020-11-02 10:02 ` Daniel P. Berrangé
2020-11-02 11:58 ` Markus Armbruster
2020-10-29 18:06 ` Paolo Bonzini
2020-10-30 10:12 ` Markus Armbruster
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=20201029133833.3450220-8-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zxq_yx_007@163.com \
/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.