From: "cron2 (Code Review)" Date: Wed, 28 Jan 2026 13:28:22 +0000 In-Reply-To: References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <807ab047c56d4658a5f8104ebfa5a5a3f1944373-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="G337y/iYBSs="; charset=UTF-8 Subject: [Openvpn-devel] [XS] Change in openvpn[master]: tunnel_server(): close correct inotify fd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --G337y/iYBSs= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1497?usp=3Demail to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+2 by plaisthos Change subject: tunnel_server(): close correct inotify fd ...................................................................... tunnel_server(): close correct inotify fd On a full SIGUSR1 restart of a p2mp server compiled with --enable-async-push, tunnel_server() will try to close and reopen the "inotify" control file descriptor. For whatever reason, the original code referenced the wrong context, always closing fd 0. As a consequence of this, on the second SIGUSR1 restart, the server will close() the first active socket file descriptor, and if there are active DCO clients, the resulting event confusion will lead to an ASSERT(!mi->halt). Fix by closing the correct FD. Add logging. Github: fixes OpenVPN/openvpn#966 Change-Id: Iabc117848ad7b67d240c392f1a6aa2d7531fd5bb Signed-off-by: Gert Doering Acked-by: Arne Schwabe Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1497 Message-Id: <20260128110425.24350-1-gert@...1296...> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg35= 478.html Signed-off-by: Gert Doering --- M src/openvpn/multi.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/97/1497/2 diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 2af49d2..d983793 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -4244,7 +4244,9 @@ tunnel_server_loop(&multi); #ifdef ENABLE_ASYNC_PUSH - close(top->c2.inotify_fd); + msg(D_LOW, "%s: close multi.top.c2.inotify_fd (%d)", + __func__, multi.top.c2.inotify_fd); + close(multi.top.c2.inotify_fd); #endif /* shut down management interface */ -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1497?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings?usp=3Demail Gerrit-MessageType: newpatchset Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Iabc117848ad7b67d240c392f1a6aa2d7531fd5bb Gerrit-Change-Number: 1497 Gerrit-PatchSet: 2 Gerrit-Owner: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel --G337y/iYBSs= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

cron2 upl= oaded patch set #2 to this change.

View Change

The followi= ng approvals got outdated and were removed: Code-Review+2 by plaisthos

tunnel_server(): close correct =
inotify fd

On a full SIGUSR1 restart of a p2mp server compiled with<= br>--enable-async-push, tunnel_server() will try to close and reopen
the= "inotify" control file descriptor. For whatever reason, the
= original code referenced the wrong context, always closing fd 0.

As = a consequence of this, on the second SIGUSR1 restart, the server
will cl= ose() the first active socket file descriptor, and if there
are active D= CO clients, the resulting event confusion will lead to
an ASSERT(!mi->= ;halt).

Fix by closing the correct FD. Add logging.

Github: f= ixes OpenVPN/openvpn#966

Change-Id: Iabc117848ad7b67d240c392f1a6aa2d= 7531fd5bb
Signed-off-by: Gert Doering <gert@...1296...>
Acked-b= y: Arne Schwabe <arne-openvpn@...1227...>
Gerrit URL: https://gerr= it.openvpn.net/c/openvpn/+/1497
Message-Id: <20260128110425.24350-1-g= ert@...1296...>
URL: https://www.mail-archive.com/openvpn-devel@...1697...= .sourceforge.net/msg35478.html
Signed-off-by: Gert Doering <gert@...1386...= 296...>
---
M src/openvpn/multi.c
1 file changed, 3 insertions(= +), 1 deletion(-)

git pull ssh://gerrit.openvpn.=
net:29418/openvpn refs/changes/97/1497/2
diff --git a/src/openvpn/m=
ulti.c b/src/openvpn/multi.c
index 2af49d2..d983793 100644<= /span>
--- a/src/openvpn/multi.c
+++ b/src/openvpn= /multi.c
@@ -4244,7 +4244,9 @@
tunnel_= server_loop(&multi);

#ifdef ENABLE_A= SYNC_PUSH
- close(to= p->c2.inotify_fd);
+ msg(D_LOW, "%s: close multi.top.c2.inotify_fd (%d)",=
+ __func__, multi.to= p.c2.inotify_fd);
+ = close(multi.top.c2.inotify_fd);
#endif
=
/* shut down management interface */
=

To view, visit change 1497. To unsubscribe, or for help wri= ting mail filters, visit settings.

=
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iabc117848ad7b67d240c392f1a6= aa2d7531fd5bb
Gerrit-Change-Number: 1497
Gerrit-PatchSet: 2
Gerrit-Owner: cron2 <gert@...1296...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
= --G337y/iYBSs=--