Re: [Libguestfs] [libnbd PATCH v2 2/2] macOS: Simple cloexec/nonblock fix

This is the most trivial way to fix the issue with macOS not having SOCK_CLOEXEC and SOCK_NONBLOCK. This is the only way to make it work on such platform(s) unless they are fixed. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- lib/internal.h | 7 ++ generator/states-connect-socket-activation.c | 2 +- generator/states-connect.c | 11 +-- lib/utils.c | 79 ++++++++++++++++++++ fuzzing/libnbd-fuzz-wrapper.c | 4 + fuzzing/libnbd-libfuzzer-test.c | 4 + 6 files changed, 101 insertions(+), 6 deletions(-) diff --git a/lib/internal.h b/lib/internal.h index 01f9d8ab5fea..12938aaa0444 100644 --- a/lib/internal.h +++ b/lib/internal.h @@ -467,4 +467,11 @@ extern char *nbd_internal_printable_buffer (const void *buf, size_t count); extern char *nbd_internal_printable_string (const char *str); extern char *nbd_internal_printable_string_list (char **list); +/* + * These are wrappers over socket(2) and socketpair(2) that work on macOS where + * SOCK_NONBLOCK and SOCK_CLOEXEC are not available.

+int nbd_internal_socket(int domain, + int type, + int protocol, + bool nonblock) +{ + int fd; + + /* So far we do not know about any platform that has SOCK_CLOEXEC and lacks + * SOCK_NONBLOCK at the same time. + * + * The workaround for missing SOCK_CLOEXEC introduces a race which cannot be + * fixed until support for SOCK_CLOEXEC is added (or other fix is implemented). + */

+int +nbd_internal_socketpair (int domain, int type, int protocol, int *fds) +{ + int ret; + + /* + * Same as with nbd_internal_socket() this workaround for missing SOCK_CLOEXEC + * introduces a race which cannot be fixed until support for SOCK_CLOEXEC is + * added (or other fix is implemented). + */