shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-10 16:58:28 +03:00
Code

core/exec-invoke: modernize connect_unix_harder

Browse Source
This commit is contained in:
Mike Yuan 2024-04-09 21:38:16 +08:00
parent ffd0cca34a
commit 9b076e86c0
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
1 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3699,11 +3699,12 @@ static int add_shifted_fd(int *fds, size_t fds_size, size_t *n_fds, int *fd) {
} }
static int connect_unix_harder(const ExecContext *c, const ExecParameters *p, const OpenFile *of, int ofd) { static int connect_unix_harder(const ExecContext *c, const ExecParameters *p, const OpenFile *of, int ofd) {
static const int socket_types[] = { SOCK_DGRAM, SOCK_STREAM, SOCK_SEQPACKET };
union sockaddr_union addr = { union sockaddr_union addr = {
.un.sun_family = AF_UNIX, .un.sun_family = AF_UNIX,
}; };
socklen_t sa_len; socklen_t sa_len;
static const int socket_types[] = { SOCK_DGRAM, SOCK_STREAM, SOCK_SEQPACKET };
int r; int r;
assert(c); assert(c);
@ -3713,37 +3714,29 @@ static int connect_unix_harder(const ExecContext *c, const ExecParameters *p, co
r = sockaddr_un_set_path(&addr.un, FORMAT_PROC_FD_PATH(ofd)); r = sockaddr_un_set_path(&addr.un, FORMAT_PROC_FD_PATH(ofd));
if (r < 0) if (r < 0)
return log_exec_error_errno(c, p, r, "Failed to set sockaddr for %s: %m", of->path); return log_exec_error_errno(c, p, r, "Failed to set sockaddr for '%s': %m", of->path);
sa_len = r; sa_len = r;
for (size_t i = 0; i < ELEMENTSOF(socket_types); i++) { FOREACH_ARRAY(i, socket_types, ELEMENTSOF(socket_types)) {
_cleanup_close_ int fd = -EBADF; _cleanup_close_ int fd = -EBADF;
fd = socket(AF_UNIX, socket_types[i] | SOCK_CLOEXEC, 0); fd = socket(AF_UNIX, *i|SOCK_CLOEXEC, 0);
if (fd < 0) if (fd < 0)
return log_exec_error_errno(c, return log_exec_error_errno(c, p,
p, errno, "Failed to create socket for '%s': %m",
errno,
"Failed to create socket for %s: %m",
of->path); of->path);
r = RET_NERRNO(connect(fd, &addr.sa, sa_len)); r = RET_NERRNO(connect(fd, &addr.sa, sa_len));
if (r == -EPROTOTYPE) if (r >= 0)
continue; return TAKE_FD(fd);
if (r < 0) if (r != -EPROTOTYPE)
return log_exec_error_errno(c, return log_exec_error_errno(c, p,
p, r, "Failed to connect to socket for '%s': %m",
r,
"Failed to connect socket for %s: %m",
of->path); of->path);
return TAKE_FD(fd);
} }
return log_exec_error_errno(c, return log_exec_error_errno(c, p,
p, SYNTHETIC_ERRNO(EPROTOTYPE), "No suitable socket type to connect to socket '%s'.",
SYNTHETIC_ERRNO(EPROTOTYPE), "Failed to connect socket for \"%s\".",
of->path); of->path);
} }