diff options
42 files changed, 68 insertions, 65 deletions
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index da03a884f8..6afcf066cd 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -1130,7 +1130,7 @@ static int ptsname_namespace(int pty, char **ret) { int openpt_allocate_in_namespace(pid_t pid, int flags, char **ret_slave) { _cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, usernsfd = -EBADF, rootfd = -EBADF, fd = -EBADF; - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF }; pid_t child; int r; @@ -1183,7 +1183,7 @@ int openpt_allocate_in_namespace(pid_t pid, int flags, char **ret_slave) { int open_terminal_in_namespace(pid_t pid, const char *name, int mode) { _cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, usernsfd = -EBADF, rootfd = -EBADF; - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF }; pid_t child; int r; diff --git a/src/core/automount.c b/src/core/automount.c index d2976d6734..361034d7f4 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -573,7 +573,7 @@ static void automount_trigger_notify(Unit *u, Unit *other) { static void automount_enter_waiting(Automount *a) { _cleanup_close_ int ioctl_fd = -EBADF; - int p[2] = { -1, -1 }; + int pipe_fd[2] = { -EBADF, -EBADF }; char name[STRLEN("systemd-") + DECIMAL_STR_MAX(pid_t) + 1]; _cleanup_free_ char *options = NULL; bool mounted = false; @@ -600,18 +600,18 @@ static void automount_enter_waiting(Automount *a) { goto fail; } - if (pipe2(p, O_CLOEXEC) < 0) { + if (pipe2(pipe_fd, O_CLOEXEC) < 0) { r = -errno; goto fail; } - r = fd_nonblock(p[0], true); + r = fd_nonblock(pipe_fd[0], true); if (r < 0) goto fail; if (asprintf( &options, "fd=%i,pgrp="PID_FMT",minproto=5,maxproto=5,direct%s%s", - p[1], + pipe_fd[1], getpgrp(), isempty(a->extra_options) ? "" : ",", strempty(a->extra_options)) < 0) { @@ -626,7 +626,7 @@ static void automount_enter_waiting(Automount *a) { mounted = true; - p[1] = safe_close(p[1]); + pipe_fd[1] = safe_close(pipe_fd[1]); if (stat(a->where, &st) < 0) { r = -errno; @@ -647,13 +647,13 @@ static void automount_enter_waiting(Automount *a) { if (r < 0) goto fail; - r = sd_event_add_io(UNIT(a)->manager->event, &a->pipe_event_source, p[0], EPOLLIN, automount_dispatch_io, a); + r = sd_event_add_io(UNIT(a)->manager->event, &a->pipe_event_source, pipe_fd[0], EPOLLIN, automount_dispatch_io, a); if (r < 0) goto fail; (void) sd_event_source_set_description(a->pipe_event_source, "automount-io"); - a->pipe_fd = p[0]; + a->pipe_fd = pipe_fd[0]; a->dev_id = st.st_dev; automount_set_state(a, AUTOMOUNT_WAITING); @@ -663,7 +663,7 @@ static void automount_enter_waiting(Automount *a) { fail: log_unit_error_errno(UNIT(a), r, "Failed to initialize automounter: %m"); - safe_close_pair(p); + safe_close_pair(pipe_fd); if (mounted) { r = repeat_unmount(a->where, MNT_DETACH|UMOUNT_NOFOLLOW); diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c index e0b371a4c4..763f5d4c84 100644 --- a/src/core/dynamic-user.c +++ b/src/core/dynamic-user.c @@ -74,7 +74,7 @@ static int dynamic_user_add(Manager *m, const char *name, int storage_socket[sta } static int dynamic_user_acquire(Manager *m, const char *name, DynamicUser** ret) { - _cleanup_close_pair_ int storage_socket[2] = { -1, -1 }; + _cleanup_close_pair_ int storage_socket[2] = { -EBADF, -EBADF }; DynamicUser *d; int r; diff --git a/src/core/execute.c b/src/core/execute.c index 94021f20e8..5784c8ce5c 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -2099,7 +2099,7 @@ bool exec_needs_mount_namespace( static int setup_private_users(uid_t ouid, gid_t ogid, uid_t uid, gid_t gid) { _cleanup_free_ char *uid_map = NULL, *gid_map = NULL; - _cleanup_close_pair_ int errno_pipe[2] = { -1, -1 }; + _cleanup_close_pair_ int errno_pipe[2] = { -EBADF, -EBADF }; _cleanup_close_ int unshare_ready_fd = -EBADF; _cleanup_(sigkill_waitp) pid_t pid = 0; uint64_t c = 1; @@ -6609,8 +6609,8 @@ static int exec_runtime_allocate(ExecRuntime **ret, const char *id) { *n = (ExecRuntime) { .id = TAKE_PTR(id_copy), - .netns_storage_socket = { -1, -1 }, - .ipcns_storage_socket = { -1, -1 }, + .netns_storage_socket = { -EBADF, -EBADF }, + .ipcns_storage_socket = { -EBADF, -EBADF }, }; *ret = n; @@ -6672,7 +6672,7 @@ static int exec_runtime_make( ExecRuntime **ret) { _cleanup_(namespace_cleanup_tmpdirp) char *tmp_dir = NULL, *var_tmp_dir = NULL; - _cleanup_close_pair_ int netns_storage_socket[2] = { -1, -1 }, ipcns_storage_socket[2] = { -1, -1 }; + _cleanup_close_pair_ int netns_storage_socket[2] = { -EBADF, -EBADF }, ipcns_storage_socket[2] = { -EBADF, -EBADF }; int r; assert(m); diff --git a/src/core/service.c b/src/core/service.c index 5181826c84..c967dc9897 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1402,7 +1402,7 @@ static int service_allocate_exec_fd( sd_event_source **ret_event_source, int *ret_exec_fd) { - _cleanup_close_pair_ int p[] = { -1, -1 }; + _cleanup_close_pair_ int p[] = { -EBADF, -EBADF }; int r; assert(s); diff --git a/src/core/socket.c b/src/core/socket.c index e0e91dba53..518f277053 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1502,7 +1502,7 @@ static int socket_address_listen_in_cgroup( const SocketAddress *address, const char *label) { - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF }; int fd, r; pid_t pid; @@ -2899,7 +2899,7 @@ static int socket_accept_do(Socket *s, int fd) { } static int socket_accept_in_cgroup(Socket *s, SocketPort *p, int fd) { - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF }; int cfd, r; pid_t pid; diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index f5c0732cf5..29265d9220 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -241,7 +241,7 @@ static int fsck_progress_socket(void) { } static int run(int argc, char *argv[]) { - _cleanup_close_pair_ int progress_pipe[2] = { -1, -1 }; + _cleanup_close_pair_ int progress_pipe[2] = { -EBADF, -EBADF }; _cleanup_(sd_device_unrefp) sd_device *dev = NULL; _cleanup_free_ char *dpath = NULL; _cleanup_fclose_ FILE *console = NULL; diff --git a/src/fuzz/fuzz-varlink.c b/src/fuzz/fuzz-varlink.c index 397c20dca6..c97586be9e 100644 --- a/src/fuzz/fuzz-varlink.c +++ b/src/fuzz/fuzz-varlink.c @@ -85,7 +85,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { struct iovec server_iov = IOVEC_MAKE((void*) data, size), client_iov = IOVEC_MAKE((void*) data, size); /* Important: the declaration order matters here! we want that the fds are closed on return after the * event sources, hence we declare the fds first, the event sources second */ - _cleanup_close_pair_ int server_pair[2] = { -1, -1 }, client_pair[2] = { -1, -1 }; + _cleanup_close_pair_ int server_pair[2] = { -EBADF, -EBADF }, client_pair[2] = { -EBADF, -EBADF }; _cleanup_(sd_event_source_unrefp) sd_event_source *idle_event_source = NULL, *server_event_source = NULL, *client_event_source = NULL; _cleanup_(varlink_server_unrefp) VarlinkServer *s = NULL; diff --git a/src/import/import-common.c b/src/import/import-common.c index 3c46aedf61..eb52c6c116 100644 --- a/src/import/import-common.c +++ b/src/import/import-common.c @@ -23,7 +23,7 @@ #include "tmpfile-util.h" int import_fork_tar_x(const char *path, pid_t *ret) { - _cleanup_close_pair_ int pipefd[2] = { -1, -1 }; + _cleanup_close_pair_ int pipefd[2] = { -EBADF, -EBADF }; bool use_selinux; pid_t pid; int r; @@ -96,7 +96,7 @@ int import_fork_tar_x(const char *path, pid_t *ret) { } int import_fork_tar_c(const char *path, pid_t *ret) { - _cleanup_close_pair_ int pipefd[2] = { -1, -1 }; + _cleanup_close_pair_ int pipefd[2] = { -EBADF, -EBADF }; bool use_selinux; pid_t pid; int r; diff --git a/src/import/importd.c b/src/import/importd.c index b2d176b4e7..b6d90cde10 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -356,7 +356,7 @@ static int transfer_on_log(sd_event_source *s, int fd, uint32_t revents, void *u } static int transfer_start(Transfer *t) { - _cleanup_close_pair_ int pipefd[2] = { -1, -1 }; + _cleanup_close_pair_ int pipefd[2] = { -EBADF, -EBADF }; int r; assert(t); diff --git a/src/import/pull-common.c b/src/import/pull-common.c index 7633d3e74b..1c7194fd6b 100644 --- a/src/import/pull-common.c +++ b/src/import/pull-common.c @@ -381,7 +381,7 @@ static int verify_gpg( const void *payload, size_t payload_size, const void *signature, size_t signature_size) { - _cleanup_close_pair_ int gpg_pipe[2] = { -1, -1 }; + _cleanup_close_pair_ int gpg_pipe[2] = { -EBADF, -EBADF }; char sig_file_path[] = "/tmp/sigXXXXXX", gpg_home[] = "/tmp/gpghomeXXXXXX"; _cleanup_(sigkill_waitp) pid_t pid = 0; bool gpg_home_created = false; diff --git a/src/journal/fuzz-journald-stream.c b/src/journal/fuzz-journald-stream.c index 67e990ab7c..cece8c440e 100644 --- a/src/journal/fuzz-journald-stream.c +++ b/src/journal/fuzz-journald-stream.c @@ -9,7 +9,7 @@ #include "fuzz-journald.h" #include "journald-stream.h" -static int stream_fds[2] = { -1, -1 }; +static int stream_fds[2] = { -EBADF, -EBADF }; int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { Server s; diff --git a/src/libsystemd-network/fuzz-dhcp6-client.c b/src/libsystemd-network/fuzz-dhcp6-client.c index a1c34365c0..7da285e54e 100644 --- a/src/libsystemd-network/fuzz-dhcp6-client.c +++ b/src/libsystemd-network/fuzz-dhcp6-client.c @@ -10,7 +10,7 @@ #include "fd-util.h" #include "fuzz.h" -static int test_dhcp_fd[2] = { -1, -1 }; +static int test_dhcp_fd[2] = { -EBADF, -EBADF }; int dhcp6_network_send_udp_socket(int s, struct in6_addr *server_address, const void *packet, size_t len) { return len; diff --git a/src/libsystemd-network/fuzz-lldp-rx.c b/src/libsystemd-network/fuzz-lldp-rx.c index 6419075a4a..00a98bbeb0 100644 --- a/src/libsystemd-network/fuzz-lldp-rx.c +++ b/src/libsystemd-network/fuzz-lldp-rx.c @@ -10,7 +10,7 @@ #include "fuzz.h" #include "lldp-network.h" -static int test_fd[2] = { -1, -1 }; +static int test_fd[2] = { -EBADF, -EBADF }; int lldp_network_bind_raw_socket(int ifindex) { if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, test_fd) < 0) diff --git a/src/libsystemd-network/fuzz-ndisc-rs.c b/src/libsystemd-network/fuzz-ndisc-rs.c index b294611fab..b794e2ad42 100644 --- a/src/libsystemd-network/fuzz-ndisc-rs.c +++ b/src/libsystemd-network/fuzz-ndisc-rs.c @@ -11,7 +11,7 @@ #include "socket-util.h" #include "ndisc-internal.h" -static int test_fd[2] = { -1, -1 }; +static int test_fd[2] = { -EBADF, -EBADF }; int icmp6_bind_router_solicitation(int index) { assert_se(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, test_fd) >= 0); diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c index c3c89514f8..7344099e77 100644 --- a/src/libsystemd-network/test-dhcp6-client.c +++ b/src/libsystemd-network/test-dhcp6-client.c @@ -73,7 +73,7 @@ static const uint8_t server_id[] = { SERVER_ID_BYTES }; static const struct ether_addr mac = { .ether_addr_octet = { 'A', 'B', 'C', '1', '2', '3' }, }; -static int test_fd[2] = { -1, -1, }; +static int test_fd[2] = { -EBADF, -EBADF }; static int test_ifindex = 42; static unsigned test_client_sent_message_count = 0; static sd_dhcp6_client *client_ref = NULL; diff --git a/src/libsystemd-network/test-lldp-rx.c b/src/libsystemd-network/test-lldp-rx.c index 11049a85b9..7ec1ab1ee9 100644 --- a/src/libsystemd-network/test-lldp-rx.c +++ b/src/libsystemd-network/test-lldp-rx.c @@ -20,7 +20,7 @@ #define TEST_LLDP_TYPE_SYSTEM_NAME "systemd-lldp" #define TEST_LLDP_TYPE_SYSTEM_DESC "systemd-lldp-desc" -static int test_fd[2] = { -1, -1 }; +static int test_fd[2] = { -EBADF, -EBADF }; static int lldp_rx_handler_calls; int lldp_network_bind_raw_socket(int ifindex) { diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c index 3047dce858..4a1d4d2ef8 100644 --- a/src/libsystemd/sd-bus/bus-container.c +++ b/src/libsystemd/sd-bus/bus-container.c @@ -12,7 +12,7 @@ #include "string-util.h" int bus_container_connect_socket(sd_bus *b) { - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF }; _cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, usernsfd = -EBADF, rootfd = -EBADF; int r, error_buf = 0; pid_t child; diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c index 7d7dc390dd..a402a70223 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -211,7 +211,7 @@ int main(int argc, char *argv[]) { MODE_CHART, } mode = MODE_BISECT; Type type = TYPE_LEGACY; - int i, pair[2] = { -1, -1 }; + int i, pair[2] = { -EBADF, -EBADF }; _cleanup_free_ char *address = NULL, *server_name = NULL; _cleanup_close_ int bus_ref = -1; const char *unique; diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c index 9b5efcce59..382761171c 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/sd-bus/test-bus-chat.c @@ -260,7 +260,7 @@ static void* client1(void *p) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; const char *hello; int r; - _cleanup_close_pair_ int pp[2] = { -1, -1 }; + _cleanup_close_pair_ int pp[2] = { -EBADF, -EBADF }; char x; r = sd_bus_open_user(&bus); diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c index 91f9605171..46125fedf1 100644 --- a/src/libsystemd/sd-daemon/sd-daemon.c +++ b/src/libsystemd/sd-daemon/sd-daemon.c @@ -549,7 +549,7 @@ finish: } _public_ int sd_notify_barrier(int unset_environment, uint64_t timeout) { - _cleanup_close_pair_ int pipe_fd[2] = { -1, -1 }; + _cleanup_close_pair_ int pipe_fd[2] = { -EBADF, -EBADF }; int r; if (pipe2(pipe_fd, O_CLOEXEC) < 0) diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c index 8d0cb5861b..7cc4cc9e28 100644 --- a/src/libsystemd/sd-event/test-event.c +++ b/src/libsystemd/sd-event/test-event.c @@ -198,7 +198,8 @@ static void test_basic_one(bool with_pidfd) { sd_event *e = NULL; sd_event_source *w = NULL, *x = NULL, *y = NULL, *z = NULL, *q = NULL, *t = NULL; static const char ch = 'x'; - int a[2] = { -1, -1 }, b[2] = { -1, -1}, d[2] = { -1, -1}, k[2] = { -1, -1 }; + int a[2] = { -EBADF, -EBADF }, b[2] = { -EBADF, -EBADF }, + d[2] = { -EBADF, -EBADF }, k[2] = { -EBADF, -EBADF }; uint64_t event_now; int64_t priority; diff --git a/src/libsystemd/sd-login/test-login.c b/src/libsystemd/sd-login/test-login.c index f7cef6e304..2b2d1c4b64 100644 --- a/src/libsystemd/sd-login/test-login.c +++ b/src/libsystemd/sd-login/test-login.c @@ -37,7 +37,7 @@ static const char *e(int r) { } TEST(login) { - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF }; _cleanup_free_ char *pp = NULL, *qq = NULL, *display_session = NULL, *cgroup = NULL, *display = NULL, *remote_user = NULL, *remote_host = NULL, diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c index 698052dd86..f8c09a8b7c 100644 --- a/src/machine/image-dbus.c +++ b/src/machine/image-dbus.c @@ -31,7 +31,7 @@ int bus_image_method_remove( void *userdata, sd_bus_error *error) { - _cleanup_close_pair_ int errno_pipe_fd[2] = { -1, -1 }; + _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF }; Image *image = ASSERT_PTR(userdata); Manager *m = image->userdata; pid_t child; @@ -145,7 +145,7 @@ int bus_image_method_clone( void *userdata, sd_bus_error *error) { - _cleanup_close_pair_ int errno_pipe_fd[2] = { -1, -1 }; + _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF }; Image *image = ASSERT_PTR(userdata); Manager *m = ASSERT_PTR(image->userdata); const char *new_name; diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 26ba5d4292..1867893004 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -223,7 +223,7 @@ int bus_machine_method_get_addresses(sd_bus_message *message, void *userdata, sd } case MACHINE_CONTAINER: { - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF }; _cleanup_free_ char *us = NULL, *them = NULL; _cleanup_close_ int netns_fd = -EBADF; const char *p; @@ -371,7 +371,7 @@ int bus_machine_method_get_os_release(sd_bus_message *message, void *userdata, s case MACHINE_CONTAINER: { _cleanup_close_ int mntns_fd = -EBADF, root_fd = -EBADF, pidns_fd = -EBADF; - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF }; _cleanup_fclose_ FILE *f = NULL; pid_t child; @@ -888,7 +888,7 @@ int bus_machine_method_bind_mount(sd_bus_message *message, void *userdata, sd_bu int bus_machine_method_copy(sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *host_basename = NULL, *container_basename = NULL; const char *src, *dest, *host_path, *container_path; - _cleanup_close_pair_ int errno_pipe_fd[2] = { -1, -1 }; + _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF }; CopyFlags copy_flags = COPY_REFLINK|COPY_MERGE|COPY_HARDLINKS; _cleanup_close_ int hostfd = -EBADF; Machine *m = ASSERT_PTR(userdata); @@ -1085,7 +1085,7 @@ int bus_machine_method_open_root_directory(sd_bus_message *message, void *userda case MACHINE_CONTAINER: { _cleanup_close_ int mntns_fd = -EBADF, root_fd = -EBADF; - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF }; pid_t child; r = namespace_open(m->leader, NULL, &mntns_fd, NULL, NULL, &root_fd); diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index aef3e90542..ed28627826 100644 --- a/src/machine/machined-dbus.c +++ b/src/machine/machined-dbus.c @@ -683,7 +683,7 @@ static int method_clean_pool(sd_bus_message *message, void *userdata, sd_bus_err REMOVE_HIDDEN, } mode; - _cleanup_close_pair_ int errno_pipe_fd[2] = { -1, -1 }; + _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF }; _cleanup_close_ int result_fd = -EBADF; Manager *m = userdata; Operation *operation; diff --git a/src/portable/portable.c b/src/portable/portable.c index 45dd70b13d..28d9ccd302 100644 --- a/src/portable/portable.c +++ b/src/portable/portable.c @@ -355,7 +355,7 @@ static int portable_extract_by_path( else { _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL; _cleanup_(rmdir_and_freep) char *tmpdir = NULL; - _cleanup_(close_pairp) int seq[2] = { -1, -1 }; + _cleanup_(close_pairp) int seq[2] = { -EBADF, -EBADF }; _cleanup_(sigkill_waitp) pid_t child = 0; /* We now have a loopback block device, let's fork off a child in its own mount namespace, mount it diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c index 704b51d81d..f0eb71b710 100644 --- a/src/portable/portabled-image-bus.c +++ b/src/portable/portabled-image-bus.c @@ -486,7 +486,7 @@ int bus_image_common_remove( Image *image, sd_bus_error *error) { - _cleanup_close_pair_ int errno_pipe_fd[2] = { -1, -1 }; + _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF }; _cleanup_(sigkill_waitp) pid_t child = 0; PortableState state; int r; diff --git a/src/shared/data-fd-util.c b/src/shared/data-fd-util.c index 15d31ac20c..0a4ef3fffc 100644 --- a/src/shared/data-fd-util.c +++ b/src/shared/data-fd-util.c @@ -26,7 +26,7 @@ #define DATA_FD_TMP_LIMIT (1024U*1024U) int acquire_data_fd(const void *data, size_t size, unsigned flags) { - _cleanup_close_pair_ int pipefds[2] = { -1, -1 }; + _cleanup_close_pair_ int pipefds[2] = { -EBADF, -EBADF }; char pattern[] = "/dev/shm/data-fd-XXXXXX"; _cleanup_close_ int fd = -EBADF; int isz = 0, r; @@ -218,7 +218,7 @@ int copy_data_fd(int fd) { /* Hmm, pity, this didn't fit. Let's fall back to /tmp then, see below */ } else { - _cleanup_(close_pairp) int pipefds[2] = { -1, -1 }; + _cleanup_(close_pairp) int pipefds[2] = { -EBADF, -EBADF }; int isz; /* If memfds aren't available, use a pipe. Set O_NONBLOCK so that we will get EAGAIN rather diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index c9acc2e306..e2905b646d 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -2696,7 +2696,7 @@ int dissected_image_acquire_metadata(DissectedImage *m, DissectImageFlags extra_ }; _cleanup_strv_free_ char **machine_info = NULL, **os_release = NULL, **initrd_release = NULL, **extension_release = NULL; - _cleanup_close_pair_ int error_pipe[2] = { -1, -1 }; + _cleanup_close_pair_ int error_pipe[2] = { -EBADF, -EBADF }; _cleanup_(rmdir_and_freep) char *t = NULL; _cleanup_(sigkill_waitp) pid_t child = 0; sd_id128_t machine_id = SD_ID128_NULL; diff --git a/src/shared/elf-util.c b/src/shared/elf-util.c index 0c694d79f3..bbe59f7af6 100644 --- a/src/shared/elf-util.c +++ b/src/shared/elf-util.c @@ -744,7 +744,9 @@ static int parse_elf(int fd, const char *executable, char **ret, JsonVariant **r } int parse_elf_object(int fd, const char *executable, bool fork_disable_dump, char **ret, JsonVariant **ret_package_metadata) { - _cleanup_close_pair_ int error_pipe[2] = { -1, -1 }, return_pipe[2] = { -1, -1 }, json_pipe[2] = { -1, -1 }; + _cleanup_close_pair_ int error_pipe[2] = { -EBADF, -EBADF }, + return_pipe[2] = { -EBADF, -EBADF }, + json_pipe[2] = { -EBADF, -EBADF }; _cleanup_(json_variant_unrefp) JsonVariant *package_metadata = NULL; _cleanup_free_ char *buf = NULL; int r; diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index 535b617044..1be22a62c6 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -1624,7 +1624,7 @@ int add_matches_for_user_unit(sd_journal *j, const char *unit, uid_t uid) { } static int get_boot_id_for_machine(const char *machine, sd_id128_t *boot_id) { - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2] = { -EBADF, -EBADF }; _cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, rootfd = -EBADF; char buf[SD_ID128_UUID_STRING_MAX]; pid_t pid, child; diff --git a/src/shared/mount-util.c b/src/shared/mount-util.c index 6e4fa4a486..80cf87526e 100644 --- a/src/shared/mount-util.c +++ b/src/shared/mount-util.c @@ -806,7 +806,7 @@ static int mount_in_namespace( const MountOptions *options, bool is_image) { - _cleanup_close_pair_ int errno_pipe_fd[2] = { -1, -1 }; + _cleanup_close_pair_ int errno_pipe_fd[2] = { -EBADF, -EBADF }; _cleanup_close_ int mntns_fd = -EBADF, root_fd = -EBADF, pidns_fd = -EBADF, chased_src_fd = -EBADF; char mount_slave[] = "/tmp/propagate.XXXXXX", *mount_tmp, *mount_outside, *p; bool mount_slave_created = false, mount_slave_mounted = false, diff --git a/src/shared/pager.c b/src/shared/pager.c index 74a6f9fd41..831cc1dce0 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -83,7 +83,7 @@ static int no_quit_on_interrupt(int exe_name_fd, const char *less_opts) { } void pager_open(PagerFlags flags) { - _cleanup_close_pair_ int fd[2] = { -1, -1 }, exe_name_pipe[2] = { -1, -1 }; + _cleanup_close_pair_ int fd[2] = { -EBADF, -EBADF }, exe_name_pipe[2] = { -EBADF, -EBADF }; _cleanup_strv_free_ char **pager_args = NULL; _cleanup_free_ char *l = NULL; const char *pager, *less_opts; diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index c3bb293520..d73bdbdc1e 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -487,8 +487,8 @@ static int add_connection_socket(Context *context, int fd) { .context = context, .server_fd = fd, .client_fd = -EBADF, - .server_to_client_buffer = {-1, -1}, - .client_to_server_buffer = {-1, -1}, + .server_to_client_buffer = { -EBADF, -EBADF }, + .client_to_server_buffer = { -EBADF, -EBADF }, }; r = set_ensure_put(&context->connections, NULL, c); diff --git a/src/sysupdate/sysupdate-resource.c b/src/sysupdate/sysupdate-resource.c index 56ce9b31cf..759c81a4f0 100644 --- a/src/sysupdate/sysupdate-resource.c +++ b/src/sysupdate/sysupdate-resource.c @@ -242,7 +242,7 @@ static int download_manifest( size_t *ret_size) { _cleanup_free_ char *buffer = NULL, *suffixed_url = NULL; - _cleanup_(close_pairp) int pfd[2] = { -1, -1 }; + _cleanup_(close_pairp) int pfd[2] = { -EBADF, -EBADF }; _cleanup_fclose_ FILE *manifest = NULL; size_t size = 0; pid_t pid; diff --git a/src/test/test-data-fd-util.c b/src/test/test-data-fd-util.c index d466ba9315..d69648842e 100644 --- a/src/test/test-data-fd-util.c +++ b/src/test/test-data-fd-util.c @@ -81,7 +81,7 @@ static void assert_equal_fd(int fd1, int fd2) { TEST(copy_data_fd) { _cleanup_close_ int fd1 = -EBADF, fd2 = -EBADF; - _cleanup_(close_pairp) int sfd[2] = { -1, -1 }; + _cleanup_(close_pairp) int sfd[2] = { -EBADF, -EBADF }; _cleanup_(sigkill_waitp) pid_t pid = -1; int r; diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c index b546933ea4..f08d0f0dd4 100644 --- a/src/test/test-fd-util.c +++ b/src/test/test-fd-util.c @@ -58,7 +58,7 @@ TEST(close_nointr) { } TEST(same_fd) { - _cleanup_close_pair_ int p[2] = { -1, -1 }; + _cleanup_close_pair_ int p[2]; _cleanup_close_ int a, b, c; assert_se(pipe2(p, O_CLOEXEC) >= 0); diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index 74f3c9c7c8..be09f71e75 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -83,7 +83,7 @@ TEST(tmpdir) { } static void test_shareable_ns(unsigned long nsflag) { - _cleanup_close_pair_ int s[2] = { -1, -1 }; + _cleanup_close_pair_ int s[2] = { -EBADF, -EBADF }; pid_t pid1, pid2, pid3; int r, n = 0; siginfo_t si; diff --git a/src/test/test-socket-util.c b/src/test/test-socket-util.c index 6456316aae..dbafe8b058 100644 --- a/src/test/test-socket-util.c +++ b/src/test/test-socket-util.c @@ -223,7 +223,7 @@ TEST(getpeercred_getpeergroups) { TEST(passfd_read) { static const char file_contents[] = "test contents for passfd"; - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2]; int r; assert_se(socketpair(AF_UNIX, SOCK_DGRAM, 0, pair) >= 0); @@ -263,7 +263,7 @@ TEST(passfd_read) { } TEST(passfd_contents_read) { - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2]; static const char file_contents[] = "test contents in the file"; static const char wire_contents[] = "test contents on the wire"; int r; @@ -311,7 +311,7 @@ TEST(passfd_contents_read) { } TEST(receive_nopassfd) { - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2]; static const char wire_contents[] = "no fd passed here"; int r; @@ -348,7 +348,7 @@ TEST(receive_nopassfd) { } TEST(send_nodata_nofd) { - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2]; int r; assert_se(socketpair(AF_UNIX, SOCK_DGRAM, 0, pair) >= 0); @@ -381,7 +381,7 @@ TEST(send_nodata_nofd) { } TEST(send_emptydata) { - _cleanup_close_pair_ int pair[2] = { -1, -1 }; + _cleanup_close_pair_ int pair[2]; int r; assert_se(socketpair(AF_UNIX, SOCK_DGRAM, 0, pair) >= 0); diff --git a/src/test/test-varlink.c b/src/test/test-varlink.c index 7515da52ba..5811259183 100644 --- a/src/test/test-varlink.c +++ b/src/test/test-varlink.c @@ -191,7 +191,7 @@ int main(int argc, char *argv[]) { _cleanup_(rm_rf_physical_and_freep) char *tmpdir = NULL; _cleanup_(json_variant_unrefp) JsonVariant *v = NULL; _cleanup_(sd_event_unrefp) sd_event *e = NULL; - _cleanup_(close_pairp) int block_fds[2] = { -1, -1 }; + _cleanup_(close_pairp) int block_fds[2] = { -EBADF, -EBADF }; pthread_t t; const char *sp; diff --git a/src/udev/udevd.c b/src/udev/udevd.c index 0de5b4ec64..4942c852a0 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -1848,7 +1848,7 @@ static int manager_new(Manager **ret, int fd_ctrl, int fd_uevent) { *manager = (Manager) { .inotify_fd = -EBADF, - .worker_watch = { -1, -1 }, + .worker_watch = { -EBADF, -EBADF }, .cgroup = TAKE_PTR(cgroup), }; |