From: "cron2 (Code Review)" Date: Tue, 27 Jan 2026 21:56:06 +0000 References: Reply-To: gert@...1296..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net Message-ID: <7bba68a6742af281782608b763e040deae2479e3-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="OudBk3QZi/o="; 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 --OudBk3QZi/o= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: plaisthos. Hello plaisthos, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/1497?usp=3Demail to review the following change. 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 --- M src/openvpn/multi.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/97/1497/1 diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 2af49d2..8f903a4 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: newchange Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Iabc117848ad7b67d240c392f1a6aa2d7531fd5bb Gerrit-Change-Number: 1497 Gerrit-PatchSet: 1 Gerrit-Owner: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos --OudBk3QZi/o= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: plaisthos.

cron2 would like plaisthos to review this change.

V= iew Change

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 "inoti= fy" control file descriptor. For whatever reason, the
original cod= e referenced the wrong context, always closing fd 0.

As a consequenc= e of this, on the second SIGUSR1 restart, the server
will close() the fi= rst active socket file descriptor, and if there
are active DCO clients, = the resulting event confusion will lead to
an ASSERT(!mi->halt).
<= br>Fix by closing the correct FD. Add logging.

Github: fixes OpenVPN= /openvpn#966

Change-Id: Iabc117848ad7b67d240c392f1a6aa2d7531fd5bbSigned-off-by: Gert Doering <gert@...1296...>
---
M src/openvp= n/multi.c
1 file changed, 3 insertions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/97= /1497/1
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 2af49d2..8f903a4 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: clos= e multi.top.c2.inotify_fd (%d)",
+ __func__, multi.top.c2.inotify_fd );
+ close(multi.top.c2.i= notify_fd);
#endif

= /* shut down management interface */

To= view, visit change 1497. To unsubscribe, or for help writing mail filters, vis= it settings.=

Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iabc117848ad7b67d240c392f1a6= aa2d7531fd5bb
Gerrit-Change-Number: 1497
Gerrit-PatchSet: 1
Gerrit-Owner: cron2 <gert@...1296...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
= --OudBk3QZi/o=--