mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-26 19:53:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fd-uitl: rename PIPE_EBADF → EBADF_PAIR, and add EBADF_TRIPLET

Browse Source 
We use it for more than just pipe() arrays. For example also for
socketpair(). Hence let's give it a generic name.

Also add EBADF_TRIPLET to mirror this for things like
stdin/stdout/stderr arrays, which we use a bunch of times.
This commit is contained in:
Lennart Poettering 2023-10-26 18:45:33 +02:00
parent 5e21da878c
commit 7113640493
58 changed files with 86 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/basic/fd-util.c
View File

@ -654,7 +654,7 @@ int rearrange_stdio(int original_input_fd, int original_output_fd, int original_
original_output_fd,
original_error_fd },
null_fd = -EBADF, /* If we open /dev/null, we store the fd to it here */
copy_fd[3] = { -EBADF, -EBADF, -EBADF }, /* This contains all fds we duplicate here
copy_fd[3] = EBADF_TRIPLET, /* This contains all fds we duplicate here
* temporarily, and hence need to close at the end. */
r;
bool null_readable, null_writable;

5
src/basic/fd-util.h
View File

@ -16,7 +16,10 @@
/* Make sure we can distinguish fd 0 and NULL */
#define FD_TO_PTR(fd) INT_TO_PTR((fd)+1)
#define PTR_TO_FD(p) (PTR_TO_INT(p)-1)
#define PIPE_EBADF { -EBADF, -EBADF }
/* Useful helpers for initializing pipe(), socketpair() or stdio fd arrays */
#define EBADF_PAIR { -EBADF, -EBADF }
#define EBADF_TRIPLET { -EBADF, -EBADF, -EBADF }
int close_nointr(int fd);
int safe_close(int fd);

4
src/basic/terminal-util.c
View File

@ -1191,7 +1191,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] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
pid_t child;
int r;
@ -1244,7 +1244,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] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
pid_t child;
int r;

2
src/core/automount.c
View File

@ -558,7 +558,7 @@ static void automount_trigger_notify(Unit *u, Unit *other) {
}
static void automount_enter_waiting(Automount *a) {
_cleanup_close_pair_ int pipe_fd[2] = PIPE_EBADF;
_cleanup_close_pair_ int pipe_fd[2] = EBADF_PAIR;
_cleanup_close_ int ioctl_fd = -EBADF;
char name[STRLEN("systemd-") + DECIMAL_STR_MAX(pid_t) + 1];
_cleanup_free_ char *options = NULL;

2
src/core/dynamic-user.c
View File

@ -79,7 +79,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] = PIPE_EBADF;
_cleanup_close_pair_ int storage_socket[2] = EBADF_PAIR;
DynamicUser *d;
int r;

4
src/core/exec-invoke.c
View File

@ -2080,7 +2080,7 @@ static int build_pass_environment(const ExecContext *c, char ***ret) {
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] = PIPE_EBADF;
_cleanup_close_pair_ int errno_pipe[2] = EBADF_PAIR;
_cleanup_close_ int unshare_ready_fd = -EBADF;
_cleanup_(sigkill_waitp) pid_t pid = 0;
uint64_t c = 1;
@ -3906,7 +3906,7 @@ int exec_invoke(
_cleanup_free_ int *fds = NULL;
_cleanup_strv_free_ char **fdnames = NULL;
int socket_fd = -EBADF, named_iofds[3] = { -EBADF, -EBADF, -EBADF }, *params_fds = NULL;
int socket_fd = -EBADF, named_iofds[3] = EBADF_TRIPLET, *params_fds = NULL;
size_t n_storage_fds = 0, n_socket_fds = 0;
assert(command);

8
src/core/execute.c
View File

@ -1994,8 +1994,8 @@ static int exec_shared_runtime_allocate(ExecSharedRuntime **ret, const char *id)
*n = (ExecSharedRuntime) {
.id = TAKE_PTR(id_copy),
.netns_storage_socket = PIPE_EBADF,
.ipcns_storage_socket = PIPE_EBADF,
.netns_storage_socket = EBADF_PAIR,
.ipcns_storage_socket = EBADF_PAIR,
};
*ret = n;
@ -2057,7 +2057,7 @@ static int exec_shared_runtime_make(
ExecSharedRuntime **ret) {
_cleanup_(namespace_cleanup_tmpdirp) char *tmp_dir = NULL, *var_tmp_dir = NULL;
_cleanup_close_pair_ int netns_storage_socket[2] = PIPE_EBADF, ipcns_storage_socket[2] = PIPE_EBADF;
_cleanup_close_pair_ int netns_storage_socket[2] = EBADF_PAIR, ipcns_storage_socket[2] = EBADF_PAIR;
int r;
assert(m);
@ -2391,7 +2391,7 @@ int exec_runtime_make(
ExecSharedRuntime *shared,
DynamicCreds *creds,
ExecRuntime **ret) {
_cleanup_close_pair_ int ephemeral_storage_socket[2] = PIPE_EBADF;
_cleanup_close_pair_ int ephemeral_storage_socket[2] = EBADF_PAIR;
_cleanup_free_ char *ephemeral = NULL;
_cleanup_(exec_runtime_freep) ExecRuntime *rt = NULL;
int r;

6
src/core/executor.c
View File

@ -180,12 +180,12 @@ int main(int argc, char *argv[]) {
_cleanup_(exec_command_done) ExecCommand command = {};
_cleanup_(exec_params_serialized_done) ExecParameters params = EXEC_PARAMETERS_INIT(/* flags= */ 0);
_cleanup_(exec_shared_runtime_done) ExecSharedRuntime shared = {
.netns_storage_socket = PIPE_EBADF,
.ipcns_storage_socket = PIPE_EBADF,
.netns_storage_socket = EBADF_PAIR,
.ipcns_storage_socket = EBADF_PAIR,
};
_cleanup_(dynamic_creds_done) DynamicCreds dynamic_creds = {};
_cleanup_(exec_runtime_clear) ExecRuntime runtime = {
.ephemeral_storage_socket = PIPE_EBADF,
.ephemeral_storage_socket = EBADF_PAIR,
.shared = &shared,
.dynamic_creds = &dynamic_creds,
};

6
src/core/fuzz-execute-serialize.c
View File

@ -39,11 +39,11 @@ static void exec_fuzz_one(FILE *f, FDSet *fdset) {
DynamicCreds dynamic_creds = {};
ExecCommand command = {};
ExecSharedRuntime shared = {
.netns_storage_socket = PIPE_EBADF,
.ipcns_storage_socket = PIPE_EBADF,
.netns_storage_socket = EBADF_PAIR,
.ipcns_storage_socket = EBADF_PAIR,
};
ExecRuntime runtime = {
.ephemeral_storage_socket = PIPE_EBADF,
.ephemeral_storage_socket = EBADF_PAIR,
.shared = &shared,
.dynamic_creds = &dynamic_creds,
};

2
src/core/manager.c
View File

@ -911,7 +911,7 @@ int manager_new(RuntimeScope runtime_scope, ManagerTestRunFlags test_run_flags,
.notify_fd = -EBADF,
.cgroups_agent_fd = -EBADF,
.signal_fd = -EBADF,
.user_lookup_fds = PIPE_EBADF,
.user_lookup_fds = EBADF_PAIR,
.private_listen_fd = -EBADF,
.dev_autofs_fd = -EBADF,
.cgroup_inotify_fd = -EBADF,

2
src/core/service.c
View File

@ -1532,7 +1532,7 @@ static int service_allocate_exec_fd(
sd_event_source **ret_event_source,
int *ret_exec_fd) {
_cleanup_close_pair_ int p[] = PIPE_EBADF;
_cleanup_close_pair_ int p[] = EBADF_PAIR;
int r;
assert(s);

4
src/core/socket.c
View File

@ -1495,7 +1495,7 @@ static int socket_address_listen_in_cgroup(
const char *label) {
_cleanup_(pidref_done) PidRef pid = PIDREF_NULL;
_cleanup_close_pair_ int pair[2] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
int fd, r;
assert(s);
@ -2986,7 +2986,7 @@ static int socket_accept_do(Socket *s, int fd) {
static int socket_accept_in_cgroup(Socket *s, SocketPort *p, int fd) {
_cleanup_(pidref_done) PidRef pid = PIDREF_NULL;
_cleanup_close_pair_ int pair[2] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
int cfd, r;
assert(s);

2
src/coredump/coredump.c
View File

@ -1402,7 +1402,7 @@ static int can_forward_coredump(pid_t pid) {
static int forward_coredump_to_container(Context *context) {
_cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, netnsfd = -EBADF, usernsfd = -EBADF, rootfd = -EBADF;
_cleanup_close_pair_ int pair[2] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
pid_t pid, child;
struct ucred ucred = {
.pid = context->pid,

2
src/fsck/fsck.c
View File

@ -234,7 +234,7 @@ static int fsck_progress_socket(void) {
}
static int run(int argc, char *argv[]) {
_cleanup_close_pair_ int progress_pipe[2] = PIPE_EBADF;
_cleanup_close_pair_ int progress_pipe[2] = EBADF_PAIR;
_cleanup_(sd_device_unrefp) sd_device *dev = NULL;
_cleanup_free_ char *dpath = NULL;
_cleanup_fclose_ FILE *console = NULL;

2
src/fuzz/fuzz-varlink.c
View File

@ -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] = PIPE_EBADF, client_pair[2] = PIPE_EBADF;
_cleanup_close_pair_ int server_pair[2] = EBADF_PAIR, client_pair[2] = EBADF_PAIR;
_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;

4
src/import/import-common.c
View File

@ -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] = PIPE_EBADF;
_cleanup_close_pair_ int pipefd[2] = EBADF_PAIR;
bool use_selinux;
pid_t pid;
int r;
@ -92,7 +92,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] = PIPE_EBADF;
_cleanup_close_pair_ int pipefd[2] = EBADF_PAIR;
bool use_selinux;
pid_t pid;
int r;

2
src/import/importd.c
View File

@ -357,7 +357,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] = PIPE_EBADF;
_cleanup_close_pair_ int pipefd[2] = EBADF_PAIR;
int r;
assert(t);

2
src/import/pull-common.c
View File

@ -380,7 +380,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] = PIPE_EBADF;
_cleanup_close_pair_ int gpg_pipe[2] = EBADF_PAIR;
char sig_file_path[] = "/tmp/sigXXXXXX", gpg_home[] = "/tmp/gpghomeXXXXXX";
_cleanup_(sigkill_waitp) pid_t pid = 0;
bool gpg_home_created = false;

2
src/journal/fuzz-journald-stream.c
View File

@ -9,7 +9,7 @@
#include "fuzz-journald.h"
#include "journald-stream.h"
static int stream_fds[2] = PIPE_EBADF;
static int stream_fds[2] = EBADF_PAIR;
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
Server s;

2
src/libsystemd-network/fuzz-dhcp6-client.c
View File

@ -10,7 +10,7 @@
#include "fd-util.h"
#include "fuzz.h"
static int test_dhcp_fd[2] = PIPE_EBADF;
static int test_dhcp_fd[2] = EBADF_PAIR;
int dhcp6_network_send_udp_socket(int s, struct in6_addr *server_address, const void *packet, size_t len) {
return len;

2
src/libsystemd-network/fuzz-lldp-rx.c
View File

@ -10,7 +10,7 @@
#include "fuzz.h"
#include "lldp-network.h"
static int test_fd[2] = PIPE_EBADF;
static int test_fd[2] = EBADF_PAIR;
int lldp_network_bind_raw_socket(int ifindex) {
if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, test_fd) < 0)

2
src/libsystemd-network/icmp6-util-unix.c
View File

@ -7,7 +7,7 @@
#include "icmp6-util-unix.h"
send_ra_t send_ra_function = NULL;
int test_fd[2] = PIPE_EBADF;
int test_fd[2] = EBADF_PAIR;
static struct in6_addr dummy_link_local = {
.s6_addr = {

2
src/libsystemd-network/test-dhcp6-client.c
View File

@ -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] = PIPE_EBADF;
static int test_fd[2] = EBADF_PAIR;
static int test_ifindex = 42;
static unsigned test_client_sent_message_count = 0;
static sd_dhcp6_client *client_ref = NULL;

2
src/libsystemd-network/test-lldp-rx.c
View File

@ -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] = PIPE_EBADF;
static int test_fd[2] = EBADF_PAIR;
static int lldp_rx_handler_calls;
int lldp_network_bind_raw_socket(int ifindex) {

2
src/libsystemd/sd-bus/bus-container.c
View File

@ -12,7 +12,7 @@
#include "string-util.h"
int bus_container_connect_socket(sd_bus *b) {
_cleanup_close_pair_ int pair[2] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
_cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, usernsfd = -EBADF, rootfd = -EBADF;
int r, error_buf = 0;
pid_t child;

2
src/libsystemd/sd-bus/test-bus-benchmark.c
View File

@ -211,7 +211,7 @@ int main(int argc, char *argv[]) {
MODE_CHART,
} mode = MODE_BISECT;
Type type = TYPE_LEGACY;
int i, pair[2] = PIPE_EBADF;
int i, pair[2] = EBADF_PAIR;
_cleanup_free_ char *address = NULL, *server_name = NULL;
_cleanup_close_ int bus_ref = -EBADF;
const char *unique;

2
src/libsystemd/sd-bus/test-bus-chat.c
View File

@ -212,7 +212,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] = PIPE_EBADF;
_cleanup_close_pair_ int pp[2] = EBADF_PAIR;
char x;
r = sd_bus_open_user(&bus);

2
src/libsystemd/sd-daemon/sd-daemon.c
View File

@ -615,7 +615,7 @@ _public_ int sd_pid_notify_with_fds(
}
_public_ int sd_pid_notify_barrier(pid_t pid, int unset_environment, uint64_t timeout) {
_cleanup_close_pair_ int pipe_fd[2] = PIPE_EBADF;
_cleanup_close_pair_ int pipe_fd[2] = EBADF_PAIR;
int r;
if (pipe2(pipe_fd, O_CLOEXEC) < 0)

8
src/libsystemd/sd-event/test-event.c
View File

@ -199,8 +199,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] = PIPE_EBADF, b[2] = PIPE_EBADF,
d[2] = PIPE_EBADF, k[2] = PIPE_EBADF;
int a[2] = EBADF_PAIR, b[2] = EBADF_PAIR,
d[2] = EBADF_PAIR, k[2] = EBADF_PAIR;
uint64_t event_now;
int64_t priority;
@ -629,7 +629,7 @@ static int ratelimit_expired(sd_event_source *s, void *userdata) {
}
TEST(ratelimit) {
_cleanup_close_pair_ int p[2] = PIPE_EBADF;
_cleanup_close_pair_ int p[2] = EBADF_PAIR;
_cleanup_(sd_event_unrefp) sd_event *e = NULL;
_cleanup_(sd_event_source_unrefp) sd_event_source *s = NULL;
uint64_t interval;
@ -841,7 +841,7 @@ TEST(leave_ratelimit) {
bool expect_ratelimit = false, manually_left_ratelimit = false;
_cleanup_(sd_event_source_unrefp) sd_event_source *s = NULL;
_cleanup_(sd_event_unrefp) sd_event *e = NULL;
_cleanup_close_pair_ int pfd[2] = PIPE_EBADF;
_cleanup_close_pair_ int pfd[2] = EBADF_PAIR;
unsigned c = 0;
int r;

2
src/libsystemd/sd-login/test-login.c
View File

@ -39,7 +39,7 @@ static const char *e(int r) {
}
TEST(login) {
_cleanup_close_pair_ int pair[2] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
_cleanup_free_ char *pp = NULL, *qq = NULL,
*display_session = NULL, *cgroup = NULL,
*display = NULL, *remote_user = NULL, *remote_host = NULL,

4
src/machine/image-dbus.c
View File

@ -31,7 +31,7 @@ int bus_image_method_remove(
void *userdata,
sd_bus_error *error) {
_cleanup_close_pair_ int errno_pipe_fd[2] = PIPE_EBADF;
_cleanup_close_pair_ int errno_pipe_fd[2] = EBADF_PAIR;
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] = PIPE_EBADF;
_cleanup_close_pair_ int errno_pipe_fd[2] = EBADF_PAIR;
Image *image = ASSERT_PTR(userdata);
Manager *m = ASSERT_PTR(image->userdata);
const char *new_name;

8
src/machine/machine-dbus.c
View File

@ -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] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
_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] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
_cleanup_fclose_ FILE *f = NULL;
pid_t child;
@ -896,7 +896,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] = PIPE_EBADF;
_cleanup_close_pair_ int errno_pipe_fd[2] = EBADF_PAIR;
CopyFlags copy_flags = COPY_REFLINK|COPY_MERGE|COPY_HARDLINKS;
_cleanup_close_ int hostfd = -EBADF;
Machine *m = ASSERT_PTR(userdata);
@ -1093,7 +1093,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] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
pid_t child;
r = namespace_open(m->leader.pid, NULL, &mntns_fd, NULL, NULL, &root_fd);

2
src/machine/machined-dbus.c
View File

@ -688,7 +688,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] = PIPE_EBADF;
_cleanup_close_pair_ int errno_pipe_fd[2] = EBADF_PAIR;
_cleanup_close_ int result_fd = -EBADF;
Manager *m = userdata;
Operation *operation;

4
src/nspawn/nspawn.c
View File

@ -4762,8 +4762,8 @@ static int run_container(
_cleanup_(release_lock_file) LockFile uid_shift_lock = LOCK_FILE_INIT;
_cleanup_close_ int etc_passwd_lock = -EBADF;
_cleanup_close_pair_ int
fd_inner_socket_pair[2] = PIPE_EBADF,
fd_outer_socket_pair[2] = PIPE_EBADF;
fd_inner_socket_pair[2] = EBADF_PAIR,
fd_outer_socket_pair[2] = EBADF_PAIR;
_cleanup_close_ int notify_socket = -EBADF, mntns_fd = -EBADF, fd_kmsg_fifo = -EBADF;
_cleanup_(barrier_destroy) Barrier barrier = BARRIER_NULL;

2
src/portable/portable.c
View File

@ -369,7 +369,7 @@ static int portable_extract_by_path(
else {
_cleanup_(dissected_image_unrefp) DissectedImage *m = NULL;
_cleanup_(rmdir_and_freep) char *tmpdir = NULL;
_cleanup_close_pair_ int seq[2] = PIPE_EBADF;
_cleanup_close_pair_ int seq[2] = EBADF_PAIR;
_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

2
src/portable/portabled-image-bus.c
View File

@ -484,7 +484,7 @@ int bus_image_common_remove(
Image *image,
sd_bus_error *error) {
_cleanup_close_pair_ int errno_pipe_fd[2] = PIPE_EBADF;
_cleanup_close_pair_ int errno_pipe_fd[2] = EBADF_PAIR;
_cleanup_(sigkill_waitp) pid_t child = 0;
PortableState state;
int r;

4
src/shared/data-fd-util.c
View File

@ -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] = PIPE_EBADF;
_cleanup_close_pair_ int pipefds[2] = EBADF_PAIR;
_cleanup_close_ int fd = -EBADF;
int isz = 0, r;
ssize_t n;
@ -206,7 +206,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_pair_ int pipefds[2] = PIPE_EBADF;
_cleanup_close_pair_ int pipefds[2] = EBADF_PAIR;
int isz;
/* If memfds aren't available, use a pipe. Set O_NONBLOCK so that we will get EAGAIN rather

2
src/shared/dissect-image.c
View File

@ -3377,7 +3377,7 @@ int dissected_image_acquire_metadata(DissectedImage *m, DissectImageFlags extra_
};
_cleanup_strv_free_ char **machine_info = NULL, **os_release = NULL, **initrd_release = NULL, **sysext_release = NULL, **confext_release = NULL;
_cleanup_close_pair_ int error_pipe[2] = PIPE_EBADF;
_cleanup_close_pair_ int error_pipe[2] = EBADF_PAIR;
_cleanup_(rmdir_and_freep) char *t = NULL;
_cleanup_(sigkill_waitp) pid_t child = 0;
sd_id128_t machine_id = SD_ID128_NULL;

6
src/shared/elf-util.c
View File

@ -739,9 +739,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] = PIPE_EBADF,
return_pipe[2] = PIPE_EBADF,
json_pipe[2] = PIPE_EBADF;
_cleanup_close_pair_ int error_pipe[2] = EBADF_PAIR,
return_pipe[2] = EBADF_PAIR,
json_pipe[2] = EBADF_PAIR;
_cleanup_(json_variant_unrefp) JsonVariant *package_metadata = NULL;
_cleanup_free_ char *buf = NULL;
int r;

2
src/shared/logs-show.c
View File

@ -1671,7 +1671,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] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
_cleanup_close_ int pidnsfd = -EBADF, mntnsfd = -EBADF, rootfd = -EBADF;
char buf[SD_ID128_UUID_STRING_MAX];
pid_t pid, child;

4
src/shared/mount-util.c
View File

@ -852,7 +852,7 @@ static int mount_in_namespace_legacy(
const ImagePolicy *image_policy,
bool is_image) {
_cleanup_close_pair_ int errno_pipe_fd[2] = PIPE_EBADF;
_cleanup_close_pair_ int errno_pipe_fd[2] = EBADF_PAIR;
char mount_slave[] = "/tmp/propagate.XXXXXX", *mount_tmp, *mount_outside, *p;
bool mount_slave_created = false, mount_slave_mounted = false,
mount_tmp_created = false, mount_tmp_mounted = false,
@ -1079,7 +1079,7 @@ static int mount_in_namespace(
bool is_image) {
_cleanup_(dissected_image_unrefp) DissectedImage *img = NULL;
_cleanup_close_pair_ int errno_pipe_fd[2] = PIPE_EBADF;
_cleanup_close_pair_ int errno_pipe_fd[2] = EBADF_PAIR;
_cleanup_close_ int mntns_fd = -EBADF, root_fd = -EBADF, pidns_fd = -EBADF, chased_src_fd = -EBADF,
new_mount_fd = -EBADF;
_cleanup_free_ char *chased_src_path = NULL;

2
src/shared/pager.c
View File

@ -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] = PIPE_EBADF, exe_name_pipe[2] = PIPE_EBADF;
_cleanup_close_pair_ int fd[2] = EBADF_PAIR, exe_name_pipe[2] = EBADF_PAIR;
_cleanup_strv_free_ char **pager_args = NULL;
_cleanup_free_ char *l = NULL;
const char *pager, *less_opts;

2
src/shared/varlink.c
View File

@ -420,7 +420,7 @@ int varlink_connect_address(Varlink **ret, const char *address) {
}
int varlink_connect_exec(Varlink **ret, const char *_command, char **_argv) {
_cleanup_close_pair_ int pair[2] = PIPE_EBADF;
_cleanup_close_pair_ int pair[2] = EBADF_PAIR;
_cleanup_(sigkill_waitp) pid_t pid = 0;
_cleanup_free_ char *command = NULL;
_cleanup_strv_free_ char **argv = NULL;

4
src/shutdown/umount.c
View File

@ -241,7 +241,7 @@ static void log_umount_blockers(const char *mnt) {
}
static int remount_with_timeout(MountPoint *m, bool last_try) {
_cleanup_close_pair_ int pfd[2] = PIPE_EBADF;
_cleanup_close_pair_ int pfd[2] = EBADF_PAIR;
_cleanup_(sigkill_nowaitp) pid_t pid = 0;
int r;
@ -297,7 +297,7 @@ static int remount_with_timeout(MountPoint *m, bool last_try) {
}
static int umount_with_timeout(MountPoint *m, bool last_try) {
_cleanup_close_pair_ int pfd[2] = PIPE_EBADF;
_cleanup_close_pair_ int pfd[2] = EBADF_PAIR;
_cleanup_(sigkill_nowaitp) pid_t pid = 0;
int r;

4
src/socket-proxy/socket-proxyd.c
View File

@ -488,8 +488,8 @@ static int add_connection_socket(Context *context, int fd) {
.context = context,
.server_fd = fd,
.client_fd = -EBADF,
.server_to_client_buffer = PIPE_EBADF,
.client_to_server_buffer = PIPE_EBADF,
.server_to_client_buffer = EBADF_PAIR,
.client_to_server_buffer = EBADF_PAIR,
};
r = set_ensure_put(&context->connections, NULL, c);

2
src/sysupdate/sysupdate-resource.c
View File

@ -267,7 +267,7 @@ static int download_manifest(
size_t *ret_size) {
_cleanup_free_ char *buffer = NULL, *suffixed_url = NULL;
_cleanup_close_pair_ int pfd[2] = PIPE_EBADF;
_cleanup_close_pair_ int pfd[2] = EBADF_PAIR;
_cleanup_fclose_ FILE *manifest = NULL;
size_t size = 0;
pid_t pid;

2
src/test/test-copy.c
View File

@ -254,7 +254,7 @@ TEST(copy_tree) {
}
TEST(copy_bytes) {
_cleanup_close_pair_ int pipefd[2] = PIPE_EBADF;
_cleanup_close_pair_ int pipefd[2] = EBADF_PAIR;
_cleanup_close_ int infd = -EBADF;
int r, r2;
char buf[1024], buf2[1024];

2
src/test/test-data-fd-util.c
View File

@ -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_pair_ int sfd[2] = PIPE_EBADF;
_cleanup_close_pair_ int sfd[2] = EBADF_PAIR;
_cleanup_(sigkill_waitp) pid_t pid = -1;
int r;

2
src/test/test-execute.c
View File

@ -585,7 +585,7 @@ static int find_libraries(const char *exec, char ***ret) {
_cleanup_(sd_event_source_unrefp) sd_event_source *sigchld_source = NULL;
_cleanup_(sd_event_source_unrefp) sd_event_source *stdout_source = NULL;
_cleanup_(sd_event_source_unrefp) sd_event_source *stderr_source = NULL;
_cleanup_close_pair_ int outpipe[2] = PIPE_EBADF, errpipe[2] = PIPE_EBADF;
_cleanup_close_pair_ int outpipe[2] = EBADF_PAIR, errpipe[2] = EBADF_PAIR;
_cleanup_strv_free_ char **libraries = NULL;
_cleanup_free_ char *result = NULL;
pid_t pid;

2
src/test/test-fd-util.c
View File

@ -561,7 +561,7 @@ TEST(fd_reopen_condition) {
TEST(take_fd) {
_cleanup_close_ int fd1 = -EBADF, fd2 = -EBADF;
int array[2] = PIPE_EBADF, i = 0;
int array[2] = EBADF_PAIR, i = 0;
assert_se(fd1 == -EBADF);
assert_se(fd2 == -EBADF);

2
src/test/test-mempress.c
View File

@ -188,7 +188,7 @@ TEST(real_pressure) {
_cleanup_(sd_event_source_unrefp) sd_event_source *es = NULL, *cs = NULL;
_cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL;
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
_cleanup_close_pair_ int pipe_fd[2] = PIPE_EBADF;
_cleanup_close_pair_ int pipe_fd[2] = EBADF_PAIR;
_cleanup_(sd_event_unrefp) sd_event *e = NULL;
_cleanup_free_ char *scope = NULL;
const char *object;

2
src/test/test-namespace.c
View File

@ -83,7 +83,7 @@ TEST(tmpdir) {
}
static void test_shareable_ns(unsigned long nsflag) {
_cleanup_close_pair_ int s[2] = PIPE_EBADF;
_cleanup_close_pair_ int s[2] = EBADF_PAIR;
pid_t pid1, pid2, pid3;
int r, n = 0;
siginfo_t si;

2
src/test/test-process-util.c
View File

@ -859,7 +859,7 @@ TEST(get_process_threads) {
assert_se(r >= 0);
if (r == 0) {
_cleanup_close_pair_ int pfd[2] = PIPE_EBADF, ppfd[2] = PIPE_EBADF;
_cleanup_close_pair_ int pfd[2] = EBADF_PAIR, ppfd[2] = EBADF_PAIR;
pthread_t t, tt;
char x;

2
src/test/test-socket-util.c
View File

@ -333,7 +333,7 @@ TEST(pass_many_fds_contents_read) {
"/tmp/test-socket-util-passfd-contents-read-XXXXXX",
"/tmp/test-socket-util-passfd-contents-read-XXXXXX"
};
int tmpfds[3] = { -EBADF, -EBADF, -EBADF };
int tmpfds[3] = EBADF_TRIPLET;
pair[0] = safe_close(pair[0]);

2
src/test/test-varlink-idl.c
View File

@ -296,7 +296,7 @@ static void* server_thread(void *userdata) {
}
TEST(validate_method_call) {
_cleanup_close_pair_ int fd[2] = PIPE_EBADF;
_cleanup_close_pair_ int fd[2] = EBADF_PAIR;
_cleanup_(varlink_unrefp) Varlink *v = NULL;
pthread_t t;

2
src/test/test-varlink.c
View File

@ -324,7 +324,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_pair_ int block_fds[2] = PIPE_EBADF;
_cleanup_close_pair_ int block_fds[2] = EBADF_PAIR;
pthread_t t;
const char *sp;

2
src/udev/udev-manager.c
View File

@ -1197,7 +1197,7 @@ Manager* manager_new(void) {
*manager = (Manager) {
.inotify_fd = -EBADF,
.worker_watch = PIPE_EBADF,
.worker_watch = EBADF_PAIR,
.log_level = LOG_INFO,
.resolve_name_timing = RESOLVE_NAME_EARLY,
.timeout_usec = 180 * USEC_PER_SEC,

2
src/udev/udev-spawn.c
View File

@ -230,7 +230,7 @@ int udev_event_spawn(
size_t ressize,
bool *ret_truncated) {
_cleanup_close_pair_ int outpipe[2] = PIPE_EBADF, errpipe[2] = PIPE_EBADF;
_cleanup_close_pair_ int outpipe[2] = EBADF_PAIR, errpipe[2] = EBADF_PAIR;
_cleanup_strv_free_ char **argv = NULL;
char **envp = NULL;
Spawn spawn;