X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsocket.c;h=3a371917c51ddaf3eb369c16c3fc138f09bbc731;hp=82a9348d13f2f8fa617991de3b92808e25f0aca5;hb=d6c9574fb558d9e304699b1cc7522c3b133adfc9;hpb=7a58bfa4aef88c9ddead6668d83640f762938e72 diff --git a/src/socket.c b/src/socket.c index 82a9348d1..3a371917c 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -27,10 +27,10 @@ #include #include #include -#include #include "unit.h" #include "socket.h" +#include "netinet/tcp.h" #include "log.h" #include "load-dropin.h" #include "load-fragment.h" @@ -40,6 +40,7 @@ #include "missing.h" #include "special.h" #include "bus-errors.h" +#include "label.h" static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = { [SOCKET_DEAD] = UNIT_INACTIVE, @@ -116,6 +117,9 @@ static void socket_done(Unit *u) { s->service = NULL; + free(s->tcp_congestion); + s->tcp_congestion = NULL; + free(s->bind_to_device); s->bind_to_device = NULL; @@ -162,6 +166,7 @@ static int socket_instantiate_service(Socket *s) { if (r < 0) return r; + u->meta.no_gc = true; s->service = SERVICE(u); return 0; } @@ -293,7 +298,7 @@ static int socket_add_default_dependencies(Socket *s) { if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0) return r; - return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true); + return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true); } static int socket_load(Unit *u) { @@ -371,14 +376,16 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { "%sSocketMode: %04o\n" "%sDirectoryMode: %04o\n" "%sKeepAlive: %s\n" - "%sFreeBind: %s\n", + "%sFreeBind: %s\n" + "%sTCPCongestion: %s\n", prefix, socket_state_to_string(s->state), prefix, socket_address_bind_ipv6_only_to_string(s->bind_ipv6_only), prefix, s->backlog, prefix, s->socket_mode, prefix, s->directory_mode, prefix, yes_no(s->keep_alive), - prefix, yes_no(s->free_bind)); + prefix, yes_no(s->free_bind), + prefix, s->tcp_congestion); if (s->control_pid > 0) fprintf(f, @@ -439,14 +446,14 @@ static void socket_dump(Unit *u, FILE *f, const char *prefix) { if (p->type == SOCKET_SOCKET) { const char *t; int r; - char *k; + char *k = NULL; if ((r = socket_address_print(&p->address, &k)) < 0) t = strerror(-r); else t = k; - fprintf(f, "%s%s: %s\n", prefix, listen_lookup(p->address.type), k); + fprintf(f, "%s%s: %s\n", prefix, listen_lookup(p->address.type), t); free(k); } else fprintf(f, "%sListenFIFO: %s\n", prefix, p->path); @@ -632,6 +639,10 @@ static void socket_apply_socket_options(Socket *s, int fd) { if (r < 0 && x < 0) log_warning("IP_TTL/IPV6_UNICAST_HOPS failed: %m"); } + + if (s->tcp_congestion) + if (setsockopt(fd, SOL_TCP, TCP_CONGESTION, s->tcp_congestion, strlen(s->tcp_congestion)+1) < 0) + log_warning("TCP_CONGESTION failed: %m"); } static void socket_apply_fifo_options(Socket *s, int fd) { @@ -643,89 +654,25 @@ static void socket_apply_fifo_options(Socket *s, int fd) { log_warning("F_SETPIPE_SZ: %m"); } -static int selinux_getconfromexe( - const char *exe, - security_context_t *newcon) { - - security_context_t mycon = NULL, fcon = NULL; - security_class_t sclass; - int r = 0; - - r = getcon(&mycon); - if (r < 0) - goto fail; - - r = getfilecon(exe, &fcon); - if (r < 0) - goto fail; - - sclass = string_to_security_class("process"); - r = security_compute_create(mycon, fcon, sclass, newcon); - -fail: - if (r < 0) - r = -errno; - - freecon(mycon); - freecon(fcon); - return r; -} - -static int selinux_getfileconfrompath( - const security_context_t scon, - const char *path, - const char *class, - security_context_t *fcon) { - - security_context_t dir_con = NULL; - security_class_t sclass; - int r = 0; - - r = getfilecon(path, &dir_con); - if (r >= 0) { - r = -1; - if ((sclass = string_to_security_class(class)) != 0) - r = security_compute_create(scon, dir_con, sclass, fcon); - } - if (r < 0) - r = -errno; - - freecon(dir_con); - return r; -} static int fifo_address_create( const char *path, mode_t directory_mode, mode_t socket_mode, - security_context_t scon, + const char *label, int *_fd) { int fd = -1, r = 0; struct stat st; mode_t old_mask; - security_context_t filecon = NULL; assert(path); assert(_fd); mkdir_parents(path, directory_mode); - if (scon) { - if (scon && ((r = selinux_getfileconfrompath(scon, path, "fifo_file", &filecon)) == 0)) { - r = setfscreatecon(filecon); - - if (r < 0) { - log_error("Failed to set SELinux file context (%s) on %s: %m", scon, path); - r = -errno; - } - - freecon(filecon); - } - - if (r < 0 && security_getenforce() == 1) - goto fail; - } + if ((r = label_fifofile_set(label, path)) < 0) + goto fail; /* Enforce the right access mode for the fifo */ old_mask = umask(~ socket_mode); @@ -746,7 +693,7 @@ static int fifo_address_create( goto fail; } - setfscreatecon(NULL); + label_file_clear(); if (fstat(fd, &st) < 0) { r = -errno; @@ -766,7 +713,8 @@ static int fifo_address_create( return 0; fail: - setfscreatecon(NULL); + label_file_clear(); + if (fd >= 0) close_nointr_nofail(fd); @@ -776,20 +724,16 @@ fail: static int socket_open_fds(Socket *s) { SocketPort *p; int r; - security_context_t scon = NULL; + char *label = NULL; assert(s); if ((r = socket_instantiate_service(s)) < 0) return r; - if (selinux_getconfromexe(s->service->exec_command[SERVICE_EXEC_START]->path, &scon) < 0) { - log_error("Failed to get SELinux exec context for %s \n", s->service->exec_command[SERVICE_EXEC_START]->path); - if (security_getenforce() == 1) - return -errno; - } + if ((r = label_get_socket_label_from_exe(s->service->exec_command[SERVICE_EXEC_START]->path, &label)) < 0) + return r; - log_debug("SELinux Socket context for %s set to %s\n", s->service->exec_command[SERVICE_EXEC_START]->path, scon); LIST_FOREACH(port, p, s->ports) { if (p->fd >= 0) @@ -805,7 +749,7 @@ static int socket_open_fds(Socket *s) { s->free_bind, s->directory_mode, s->socket_mode, - scon, + label, &p->fd)) < 0) goto rollback; @@ -817,7 +761,7 @@ static int socket_open_fds(Socket *s) { p->path, s->directory_mode, s->socket_mode, - scon, + label, &p->fd)) < 0) goto rollback; @@ -827,12 +771,12 @@ static int socket_open_fds(Socket *s) { assert_not_reached("Unknown port type"); } - freecon(scon); + label_free(label); return 0; rollback: socket_close_fds(s); - freecon(scon); + label_free(label); return r; } @@ -1260,6 +1204,8 @@ static void socket_enter_running(Socket *s, int cfd) { s->service = NULL; s->n_accepted ++; + service->meta.no_gc = false; + unit_choose_id(UNIT(service), name); free(name); @@ -1429,7 +1375,6 @@ static int socket_serialize(Unit *u, FILE *f, FDSet *fds) { static int socket_deserialize_item(Unit *u, const char *key, const char *value, FDSet *fds) { Socket *s = SOCKET(u); - int r; assert(u); assert(key); @@ -1454,14 +1399,14 @@ static int socket_deserialize_item(Unit *u, const char *key, const char *value, } else if (streq(key, "n-accepted")) { unsigned k; - if ((r = safe_atou(value, &k)) < 0) + if (safe_atou(value, &k) < 0) log_debug("Failed to parse n-accepted value %s", value); else s->n_accepted += k; } else if (streq(key, "control-pid")) { pid_t pid; - if ((r = parse_pid(value, &pid)) < 0) + if (parse_pid(value, &pid) < 0) log_debug("Failed to parse control-pid value %s", value); else s->control_pid = pid; @@ -1720,7 +1665,7 @@ int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds) { if (p->fd >= 0) rn_fds++; - if (!(rfds = new(int, rn_fds)) < 0) + if (!(rfds = new(int, rn_fds))) return -ENOMEM; k = 0;