X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsocket-util.c;h=a2fa13e59440e6e8d2d7b6dcdcdeb28e9dcb0460;hp=0c9fc9f999e939b1c3fe188ef2b8c51a790433d1;hb=248e6030e007b6ee7b31ada6e42053cb1ebfc80d;hpb=c0120d992ce5ab004d9be5ff6ca15e5fe17f9884 diff --git a/src/socket-util.c b/src/socket-util.c index 0c9fc9f99..a2fa13e59 100644 --- a/src/socket-util.c +++ b/src/socket-util.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. @@ -29,10 +29,14 @@ #include #include #include +#include +#include #include "macro.h" #include "util.h" #include "socket-util.h" +#include "missing.h" +#include "label.h" int socket_address_parse(SocketAddress *a, const char *s) { int r; @@ -48,6 +52,11 @@ int socket_address_parse(SocketAddress *a, const char *s) { if (*s == '[') { /* IPv6 in [x:.....:z]:p notation */ + if (!socket_ipv6_is_supported()) { + log_warning("Binding to IPv6 address not available since kernel does not support IPv6."); + return -EAFNOSUPPORT; + } + if (!(e = strchr(s+1, ']'))) return -EINVAL; @@ -88,7 +97,7 @@ int socket_address_parse(SocketAddress *a, const char *s) { a->sockaddr.un.sun_family = AF_UNIX; memcpy(a->sockaddr.un.sun_path, s, l); - a->size = sizeof(sa_family_t) + l + 1; + a->size = offsetof(struct sockaddr_un, sun_path) + l + 1; } else if (*s == '@') { /* Abstract AF_UNIX socket */ @@ -100,7 +109,7 @@ int socket_address_parse(SocketAddress *a, const char *s) { a->sockaddr.un.sun_family = AF_UNIX; memcpy(a->sockaddr.un.sun_path+1, s+1, l); - a->size = sizeof(struct sockaddr_un); + a->size = offsetof(struct sockaddr_un, sun_path) + 1 + l; } else { @@ -143,12 +152,16 @@ int socket_address_parse(SocketAddress *a, const char *s) { if (idx == 0) return -EINVAL; + if (!socket_ipv6_is_supported()) { + log_warning("Binding to interface is not available since kernel does not support IPv6."); + return -EAFNOSUPPORT; + } + a->sockaddr.in6.sin6_family = AF_INET6; a->sockaddr.in6.sin6_port = htons((uint16_t) u); a->sockaddr.in6.sin6_scope_id = idx; a->sockaddr.in6.sin6_addr = in6addr_any; a->size = sizeof(struct sockaddr_in6); - } } else { @@ -159,10 +172,17 @@ int socket_address_parse(SocketAddress *a, const char *s) { if (u <= 0 || u > 0xFFFF) return -EINVAL; - a->sockaddr.in6.sin6_family = AF_INET6; - a->sockaddr.in6.sin6_port = htons((uint16_t) u); - a->sockaddr.in6.sin6_addr = in6addr_any; - a->size = sizeof(struct sockaddr_in6); + if (socket_ipv6_is_supported()) { + a->sockaddr.in6.sin6_family = AF_INET6; + a->sockaddr.in6.sin6_port = htons((uint16_t) u); + a->sockaddr.in6.sin6_addr = in6addr_any; + a->size = sizeof(struct sockaddr_in6); + } else { + a->sockaddr.in4.sin_family = AF_INET; + a->sockaddr.in4.sin_port = htons((uint16_t) u); + a->sockaddr.in4.sin_addr.s_addr = INADDR_ANY; + a->size = sizeof(struct sockaddr_in); + } } } @@ -192,23 +212,19 @@ int socket_address_verify(const SocketAddress *a) { return 0; case AF_UNIX: - if (a->size < sizeof(sa_family_t)) + if (a->size < offsetof(struct sockaddr_un, sun_path)) return -EINVAL; - if (a->size > sizeof(sa_family_t)) { + if (a->size > offsetof(struct sockaddr_un, sun_path)) { - if (a->sockaddr.un.sun_path[0] == 0) { - /* abstract */ - if (a->size != sizeof(struct sockaddr_un)) - return -EINVAL; - } else { + if (a->sockaddr.un.sun_path[0] != 0) { char *e; /* path */ if (!(e = memchr(a->sockaddr.un.sun_path, 0, sizeof(a->sockaddr.un.sun_path)))) return -EINVAL; - if (a->size != sizeof(sa_family_t) + (e - a->sockaddr.un.sun_path) + 1) + if (a->size != offsetof(struct sockaddr_un, sun_path) + (e - a->sockaddr.un.sun_path) + 1) return -EINVAL; } } @@ -265,7 +281,7 @@ int socket_address_print(const SocketAddress *a, char **p) { case AF_UNIX: { char *ret; - if (a->size <= sizeof(sa_family_t)) { + if (a->size <= offsetof(struct sockaddr_un, sun_path)) { if (!(ret = strdup(""))) return -ENOMEM; @@ -305,8 +321,10 @@ int socket_address_listen( int backlog, SocketAddressBindIPv6Only only, const char *bind_to_device, + bool free_bind, mode_t directory_mode, mode_t socket_mode, + const char *label, int *ret) { int r, fd, one; @@ -316,8 +334,20 @@ int socket_address_listen( if ((r = socket_address_verify(a)) < 0) return r; - if ((fd = socket(socket_address_family(a), a->type | SOCK_NONBLOCK | SOCK_CLOEXEC, 0)) < 0) - return -errno; + if (socket_address_family(a) == AF_INET6 && !socket_ipv6_is_supported()) + return -EAFNOSUPPORT; + + r = label_socket_set(label); + if (r < 0) + return r; + + fd = socket(socket_address_family(a), a->type | SOCK_NONBLOCK | SOCK_CLOEXEC, 0); + r = fd < 0 ? -errno : 0; + + label_socket_clear(); + + if (r < 0) + return r; if (socket_address_family(a) == AF_INET6 && only != SOCKET_ADDRESS_DEFAULT) { int flag = only == SOCKET_ADDRESS_IPV6_ONLY; @@ -330,6 +360,12 @@ int socket_address_listen( if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, bind_to_device, strlen(bind_to_device)+1) < 0) goto fail; + if (free_bind) { + one = 1; + if (setsockopt(fd, IPPROTO_IP, IP_FREEBIND, &one, sizeof(one)) < 0) + log_warning("IP_FREEBIND failed: %m"); + } + one = 1; if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) goto fail; @@ -429,7 +465,7 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) { if (strncmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path)) != 0) return false; } else { - if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, sizeof(a->sockaddr.un.sun_path)) != 0) + if (memcmp(a->sockaddr.un.sun_path, b->sockaddr.un.sun_path, a->size) != 0) return false; } @@ -443,7 +479,7 @@ bool socket_address_equal(const SocketAddress *a, const SocketAddress *b) { return true; } -bool socket_address_is(const SocketAddress *a, const char *s) { +bool socket_address_is(const SocketAddress *a, const char *s, int type) { struct SocketAddress b; assert(a); @@ -452,6 +488,8 @@ bool socket_address_is(const SocketAddress *a, const char *s) { if (socket_address_parse(&b, s) < 0) return false; + b.type = type; + return socket_address_equal(a, &b); } @@ -467,6 +505,10 @@ bool socket_address_needs_mount(const SocketAddress *a, const char *prefix) { return path_startswith(a->sockaddr.un.sun_path, prefix); } +bool socket_ipv6_is_supported(void) { + return access("/sys/module/ipv6", F_OK) == 0; +} + static const char* const socket_address_bind_ipv6_only_table[_SOCKET_ADDRESS_BIND_IPV6_ONLY_MAX] = { [SOCKET_ADDRESS_DEFAULT] = "default", [SOCKET_ADDRESS_BOTH] = "both",