|
 |
5d6eedd |
From 6eda08fbff4f911c5884876a33708cf17fa28a8b Mon Sep 17 00:00:00 2001
|
|
|
03e93e2 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
03e93e2 |
Date: Thu, 29 Dec 2016 11:21:37 +0100
|
|
|
03e93e2 |
Subject: [PATCH] core: fix sockaddr length calculation for sockaddr_pretty()
|
|
|
03e93e2 |
(#4966)
|
|
|
03e93e2 |
|
|
|
03e93e2 |
Let's simply store the socket address length in the SocketPeer object so
|
|
|
03e93e2 |
that we can use it when invoking sockaddr_pretty():
|
|
|
03e93e2 |
|
|
|
03e93e2 |
This fixes the issue described in #4943, but avoids calling
|
|
|
03e93e2 |
getpeername() twice.
|
|
|
03e93e2 |
(cherry picked from commit 41733ae1e0035c538505bc5be1ca5d67a80b4a82)
|
|
|
03e93e2 |
---
|
|
|
03e93e2 |
src/core/socket.c | 8 ++++++--
|
|
|
03e93e2 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
03e93e2 |
|
|
|
03e93e2 |
diff --git a/src/core/socket.c b/src/core/socket.c
|
|
|
03e93e2 |
index 0b1c4acfec..fe2020008f 100644
|
|
|
03e93e2 |
--- a/src/core/socket.c
|
|
|
03e93e2 |
+++ b/src/core/socket.c
|
|
|
03e93e2 |
@@ -64,6 +64,7 @@ struct SocketPeer {
|
|
|
03e93e2 |
|
|
|
03e93e2 |
Socket *socket;
|
|
|
03e93e2 |
union sockaddr_union peer;
|
|
|
03e93e2 |
+ socklen_t peer_salen;
|
|
|
03e93e2 |
};
|
|
|
03e93e2 |
|
|
|
03e93e2 |
static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
|
|
|
03e93e2 |
@@ -490,8 +491,10 @@ static void peer_address_hash_func(const void *p, struct siphash *state) {
|
|
|
03e93e2 |
|
|
|
03e93e2 |
if (s->peer.sa.sa_family == AF_INET)
|
|
|
03e93e2 |
siphash24_compress(&s->peer.in.sin_addr, sizeof(s->peer.in.sin_addr), state);
|
|
|
03e93e2 |
- else
|
|
|
03e93e2 |
+ else if (s->peer.sa.sa_family == AF_INET6)
|
|
|
03e93e2 |
siphash24_compress(&s->peer.in6.sin6_addr, sizeof(s->peer.in6.sin6_addr), state);
|
|
|
03e93e2 |
+ else
|
|
|
03e93e2 |
+ assert_not_reached("Unknown address family.");
|
|
|
03e93e2 |
}
|
|
|
03e93e2 |
|
|
|
03e93e2 |
static int peer_address_compare_func(const void *a, const void *b) {
|
|
|
03e93e2 |
@@ -609,6 +612,7 @@ int socket_acquire_peer(Socket *s, int fd, SocketPeer **p) {
|
|
|
03e93e2 |
return log_oom();
|
|
|
03e93e2 |
|
|
|
03e93e2 |
remote->peer = sa.peer;
|
|
|
03e93e2 |
+ remote->peer_salen = salen;
|
|
|
03e93e2 |
|
|
|
03e93e2 |
r = set_put(s->peers_by_address, remote);
|
|
|
03e93e2 |
if (r < 0)
|
|
|
03e93e2 |
@@ -2196,7 +2200,7 @@ static void socket_enter_running(Socket *s, int cfd) {
|
|
|
03e93e2 |
} else if (r > 0 && p->n_ref > s->max_connections_per_source) {
|
|
|
03e93e2 |
_cleanup_free_ char *t = NULL;
|
|
|
03e93e2 |
|
|
|
03e93e2 |
- sockaddr_pretty(&p->peer.sa, FAMILY_ADDRESS_SIZE(p->peer.sa.sa_family), true, false, &t);
|
|
|
03e93e2 |
+ (void) sockaddr_pretty(&p->peer.sa, p->peer_salen, true, false, &t);
|
|
|
03e93e2 |
|
|
|
03e93e2 |
log_unit_warning(UNIT(s),
|
|
|
03e93e2 |
"Too many incoming connections (%u) from source %s, dropping connection.",
|