From: Stefano Garzarella <sgarzare@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Jason Wang" <jasowang@redhat.com>,
"Coiby Xu" <Coiby.Xu@gmail.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
qemu-block@nongnu.org, "Daniel P. Berrangé" <berrange@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
slp@redhat.com, "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Brad Smith" <brad@comstyle.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Thomas Huth" <thuth@redhat.com>,
"Eric Blake" <eblake@redhat.com>, "Kevin Wolf" <kwolf@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Raphael Norwitz" <raphael@enfabrica.net>,
gmaglione@redhat.com, "Laurent Vivier" <lvivier@redhat.com>,
stefanha@redhat.com, "David Hildenbrand" <david@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Stefano Garzarella" <sgarzare@redhat.com>
Subject: [PATCH v4 05/12] contrib/vhost-user-blk: fix bind() using the right size of the address
Date: Wed, 8 May 2024 09:44:49 +0200 [thread overview]
Message-ID: <20240508074457.12367-6-sgarzare@redhat.com> (raw)
In-Reply-To: <20240508074457.12367-1-sgarzare@redhat.com>
On macOS passing `-s /tmp/vhost.socket` parameter to the vhost-user-blk
application, the bind was done on `/tmp/vhost.socke` pathname,
missing the last character.
This sounds like one of the portability problems described in the
unix(7) manpage:
Pathname sockets
When binding a socket to a pathname, a few rules should
be observed for maximum portability and ease of coding:
• The pathname in sun_path should be null-terminated.
• The length of the pathname, including the terminating
null byte, should not exceed the size of sun_path.
• The addrlen argument that describes the enclosing
sockaddr_un structure should have a value of at least:
offsetof(struct sockaddr_un, sun_path) +
strlen(addr.sun_path)+1
or, more simply, addrlen can be specified as
sizeof(struct sockaddr_un).
So let's follow the last advice and simplify the code as well.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
contrib/vhost-user-blk/vhost-user-blk.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/contrib/vhost-user-blk/vhost-user-blk.c b/contrib/vhost-user-blk/vhost-user-blk.c
index 89e5f11a64..a8ab9269a2 100644
--- a/contrib/vhost-user-blk/vhost-user-blk.c
+++ b/contrib/vhost-user-blk/vhost-user-blk.c
@@ -469,7 +469,6 @@ static int unix_sock_new(char *unix_fn)
{
int sock;
struct sockaddr_un un;
- size_t len;
assert(unix_fn);
@@ -481,10 +480,9 @@ static int unix_sock_new(char *unix_fn)
un.sun_family = AF_UNIX;
(void)snprintf(un.sun_path, sizeof(un.sun_path), "%s", unix_fn);
- len = sizeof(un.sun_family) + strlen(un.sun_path);
(void)unlink(unix_fn);
- if (bind(sock, (struct sockaddr *)&un, len) < 0) {
+ if (bind(sock, (struct sockaddr *)&un, sizeof(un)) < 0) {
perror("bind");
goto fail;
}
--
2.45.0
next prev parent reply other threads:[~2024-05-08 7:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 7:44 [PATCH v4 00/12] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 01/12] libvhost-user: set msg.msg_control to NULL when it is empty Stefano Garzarella
2024-05-08 8:57 ` Daniel P. Berrangé
2024-05-08 9:33 ` Stefano Garzarella
2024-05-08 10:23 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 02/12] libvhost-user: fail vu_message_write() if sendmsg() is failing Stefano Garzarella
2024-05-08 8:59 ` Daniel P. Berrangé
2024-05-08 10:23 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 03/12] libvhost-user: mask F_INFLIGHT_SHMFD if memfd is not supported Stefano Garzarella
2024-05-08 10:39 ` Philippe Mathieu-Daudé
2024-05-10 8:25 ` Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 04/12] vhost-user-server: do not set memory fd non-blocking Stefano Garzarella
2024-05-08 9:00 ` Daniel P. Berrangé
2024-05-08 7:44 ` Stefano Garzarella [this message]
2024-05-08 10:25 ` [PATCH v4 05/12] contrib/vhost-user-blk: fix bind() using the right size of the address Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 06/12] contrib/vhost-user-*: use QEMU bswap helper functions Stefano Garzarella
2024-05-08 10:13 ` Philippe Mathieu-Daudé
2024-05-08 10:25 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 07/12] vhost-user: enable frontends on any POSIX system Stefano Garzarella
2024-05-08 10:26 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 08/12] libvhost-user: enable it " Stefano Garzarella
2024-05-08 10:36 ` Philippe Mathieu-Daudé
2024-05-10 8:56 ` Stefano Garzarella
2024-05-10 9:56 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 09/12] contrib/vhost-user-blk: " Stefano Garzarella
2024-05-08 10:32 ` Philippe Mathieu-Daudé
2024-05-10 9:02 ` Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 10/12] hostmem: add a new memory backend based on POSIX shm_open() Stefano Garzarella
2024-05-08 11:59 ` Markus Armbruster
2024-05-10 9:37 ` Stefano Garzarella
2024-05-08 7:44 ` [PATCH v4 11/12] tests/qtest/vhost-user-blk-test: use memory-backend-shm Stefano Garzarella
2024-05-10 5:57 ` Thomas Huth
2024-05-10 10:54 ` Philippe Mathieu-Daudé
2024-05-08 7:44 ` [PATCH v4 12/12] tests/qtest/vhost-user-test: add a test case for memory-backend-shm Stefano Garzarella
2024-05-10 5:58 ` Thomas Huth
2024-05-08 10:39 ` [PATCH v4 00/12] vhost-user: support any POSIX system (tested on macOS, FreeBSD, OpenBSD) Philippe Mathieu-Daudé
2024-05-09 19:20 ` Stefan Hajnoczi
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=20240508074457.12367-6-sgarzare@redhat.com \
--to=sgarzare@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=brad@comstyle.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=eduardo@habkost.net \
--cc=gmaglione@redhat.com \
--cc=hreitz@redhat.com \
--cc=imammedo@redhat.com \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael@enfabrica.net \
--cc=slp@redhat.com \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.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 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 read-only IMAP folder(s) and NNTP newsgroup(s).