47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
From 6306373d92d077a4dc9873fb7bf7f6d29586d4c3 Mon Sep 17 00:00:00 2001
|
|
From: "Dmitry V. Levin" <ldv@strace.io>
|
|
Date: Fri, 7 Jul 2023 08:00:00 +0000
|
|
Subject: [PATCH] socket: fix use of ERRNO_IS_DISCONNECT()
|
|
|
|
Given that ERRNO_IS_DISCONNECT() also matches positive values,
|
|
make sure this macro is not called with arguments that do not have
|
|
errno semantics.
|
|
|
|
In this case the argument passed to ERRNO_IS_DISCONNECT() is the value
|
|
returned by socket_acquire_peer() which can legitimately return 1
|
|
without errno semantics, so fix this by moving ERRNO_IS_DISCONNECT()
|
|
invocation to the branch where the return value is known to be negative.
|
|
|
|
(cherry picked from commit d5f8890bbf375075c7042b31ff6e79ad491df04c)
|
|
(cherry picked from commit ebce7284fd515cc43ec90d231aadc342af5ea2d9)
|
|
|
|
Conflict:NA
|
|
Reference:https://github.com/systemd/systemd-stable/commit/6306373d92d077a4dc9873fb7bf7f6d29586d4c3
|
|
---
|
|
src/core/socket.c | 8 +++++---
|
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/core/socket.c b/src/core/socket.c
|
|
index f18ef4416d..e86e9c85b8 100644
|
|
--- a/src/core/socket.c
|
|
+++ b/src/core/socket.c
|
|
@@ -2361,10 +2361,12 @@ static void socket_enter_running(Socket *s, int cfd_in) {
|
|
|
|
if (s->max_connections_per_source > 0) {
|
|
r = socket_acquire_peer(s, cfd, &p);
|
|
- if (ERRNO_IS_DISCONNECT(r))
|
|
- return;
|
|
- if (r < 0) /* We didn't have enough resources to acquire peer information, let's fail. */
|
|
+ if (r < 0) {
|
|
+ if (ERRNO_IS_DISCONNECT(r))
|
|
+ return;
|
|
+ /* We didn't have enough resources to acquire peer information, let's fail. */
|
|
goto fail;
|
|
+ }
|
|
if (r > 0 && p->n_ref > s->max_connections_per_source) {
|
|
_cleanup_free_ char *t = NULL;
|
|
|
|
--
|
|
2.33.0
|
|
|