From: Akihiko Odaki <akihiko.odaki@gmail.com>
To: Christian Schoenebeck <qemu_oss@crudebyte.com>, qemu-devel@nongnu.org
Cc: Michael Roitzsch <reactorcontrol@icloud.com>,
Keno Fischer <keno@juliacomputing.com>,
Will Cohen <wwcohen@gmail.com>, Greg Kurz <groug@kaod.org>,
qemu-stable@nongnu.org
Subject: Re: [PATCH v2 2/5] 9pfs: fix qemu_mknodat(S_IFSOCK) on macOS
Date: Fri, 22 Apr 2022 11:43:40 +0900 [thread overview]
Message-ID: <73163b9a-bd8a-8cf1-42a1-0e4c88edfa0e@gmail.com> (raw)
In-Reply-To: <f6d632fc82d4750b73c83a2f1d1b9972cf3e26bb.1650553693.git.qemu_oss@crudebyte.com>
On 2022/04/22 0:07, Christian Schoenebeck wrote:
> mknod() on macOS does not support creating sockets, so divert to
> call sequence socket(), bind() and chmod() respectively if S_IFSOCK
> was passed with mode argument.
>
> Link: https://lore.kernel.org/qemu-devel/17933734.zYzKuhC07K@silver/
> Signed-off-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> Reviewed-by: Will Cohen <wwcohen@gmail.com>
> ---
> hw/9pfs/9p-util-darwin.c | 27 ++++++++++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/hw/9pfs/9p-util-darwin.c b/hw/9pfs/9p-util-darwin.c
> index e24d09763a..39308f2a45 100644
> --- a/hw/9pfs/9p-util-darwin.c
> +++ b/hw/9pfs/9p-util-darwin.c
> @@ -74,6 +74,27 @@ int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name,
> */
> #if defined CONFIG_PTHREAD_FCHDIR_NP
>
> +static int create_socket_file_at_cwd(const char *filename, mode_t mode) {
> + int fd, err;
> + struct sockaddr_un addr = {
> + .sun_family = AF_UNIX
> + };
> +
> + fd = socket(PF_UNIX, SOCK_DGRAM, 0);
> + if (fd == -1) {
> + return fd;
> + }
> + snprintf(addr.sun_path, sizeof(addr.sun_path), "./%s", filename);
It would result in an incorrect path if the path does not fit in
addr.sun_path. It should report an explicit error instead.
> + err = bind(fd, (struct sockaddr *) &addr, sizeof(addr));
> + if (err == -1) {
> + goto out;
You may close(fd) as soon as bind() returns (before checking the
returned value) and eliminate goto.
> + }
> + err = chmod(addr.sun_path, mode);
I'm not sure if it is fine to have a time window between bind() and
chmod(). Do you have some rationale?
Regards,
Akihiko Odaki
> +out:
> + close(fd);
> + return err;
> +}
> +
> int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev)
> {
> int preserved_errno, err;
> @@ -93,7 +114,11 @@ int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev)
> if (pthread_fchdir_np(dirfd) < 0) {
> return -1;
> }
> - err = mknod(filename, mode, dev);
> + if (S_ISSOCK(mode)) {
> + err = create_socket_file_at_cwd(filename, mode);
> + } else {
> + err = mknod(filename, mode, dev);
> + }
> preserved_errno = errno;
> /* Stop using the thread-local cwd */
> pthread_fchdir_np(-1);
next prev parent reply other threads:[~2022-04-22 2:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-21 15:08 [PATCH v2 0/5] 9pfs: macOS host fixes Christian Schoenebeck
2022-04-21 15:07 ` [PATCH v2 1/5] 9pfs: fix qemu_mknodat(S_IFREG) on macOS Christian Schoenebeck
2022-04-21 16:32 ` Greg Kurz
2022-04-21 15:07 ` [PATCH v2 2/5] 9pfs: fix qemu_mknodat(S_IFSOCK) " Christian Schoenebeck
2022-04-21 16:36 ` Greg Kurz
2022-04-21 17:29 ` Christian Schoenebeck
2022-04-22 2:43 ` Akihiko Odaki [this message]
2022-04-22 14:06 ` Christian Schoenebeck
2022-04-23 4:33 ` Akihiko Odaki
2022-04-24 18:45 ` Christian Schoenebeck
2022-04-26 3:57 ` Akihiko Odaki
2022-04-26 12:38 ` Greg Kurz
2022-04-27 2:27 ` Akihiko Odaki
2022-04-27 10:18 ` Greg Kurz
2022-04-27 12:32 ` Christian Schoenebeck
2022-04-27 13:31 ` Greg Kurz
2022-04-27 16:18 ` Christian Schoenebeck
2022-04-27 17:12 ` Will Cohen
2022-04-27 18:16 ` Christian Schoenebeck
2022-04-27 17:37 ` Greg Kurz
2022-04-27 18:36 ` Christian Schoenebeck
2022-04-21 15:07 ` [PATCH v2 3/5] 9pfs: fix wrong encoding of rdev field in Rgetattr " Christian Schoenebeck
2022-04-21 16:39 ` Greg Kurz
2022-04-21 15:07 ` [PATCH v2 4/5] 9pfs: fix wrong errno being sent to Linux client on macOS host Christian Schoenebeck
2022-04-21 16:39 ` Greg Kurz
2022-04-21 15:07 ` [PATCH v2 5/5] 9pfs: fix removing non-existent POSIX ACL xattr " Christian Schoenebeck
2022-04-21 16:40 ` Greg Kurz
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=73163b9a-bd8a-8cf1-42a1-0e4c88edfa0e@gmail.com \
--to=akihiko.odaki@gmail.com \
--cc=groug@kaod.org \
--cc=keno@juliacomputing.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=qemu_oss@crudebyte.com \
--cc=reactorcontrol@icloud.com \
--cc=wwcohen@gmail.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.