From: "its_Giaan (Code Review)" Date: Mon, 7 Jul 2025 15:04:45 +0000 In-Reply-To: References: Reply-To: gianmarco@...2726..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <69921454734f14153639bc4e7ecd6f8f0ca4018e-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="C14eM25G46s="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Multi-socket: Fix assert triggered by stale peer-id reuse List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --C14eM25G46s= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, its_Giaan, plaisthos. Hello flichtenheld, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1078?usp=3Demail to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by plaisthos Change subject: Multi-socket: Fix assert triggered by stale peer-id reuse ...................................................................... Multi-socket: Fix assert triggered by stale peer-id reuse Fixed a bug where clients using different transport protocols (UDP, TCP) could interfere with each other after a server restart. The issue occurred when a client reused a previously assigned peer-id that was now associated with a different client using a different transport protocol. For example, a UDP client could send packets with a peer-id now assigned to a TCP client, which lacks a valid context->c2.from which is filled by the recvfrom(), causing an assert to be triggered. A protocol check has been added to prevent packets from different protocols from hijacking active connections. Github: #773 Change-Id: Iecbbcf32c0059f2b16a05333b3794599060d7d6a Signed-off-by: Gianmarco De Gregori --- M src/openvpn/mudp.c 1 file changed, 13 insertions(+), 9 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/78/1078/2 diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index 93e65e0..f62e0a3 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -216,16 +216,20 @@ if (!peer_id_disabled && (peer_id < m->max_clients) && (m->ins= tances[peer_id])) { - mi =3D m->instances[peer_id]; - - *floated =3D !link_socket_actual_match(&mi->context.c2.fro= m, &m->top.c2.from); - - if (*floated) + /* Ensure that clients from previous sessions do not attem= pt to + * hijack instances of newly connected clients in multi-pr= otocol scenarios */ + if (m->instances[peer_id]->context.c2.link_sockets[0]->inf= o.proto =3D=3D sock->info.proto) { - /* reset prefix, since here we are not sure peer is th= e one it claims to be */ - ungenerate_prefix(mi); - msg(D_MULTI_MEDIUM, "Float requested for peer %" PRIu3= 2 " to %s", peer_id, - mroute_addr_print(&real, &gc)); + mi =3D m->instances[peer_id]; + *floated =3D !link_socket_actual_match(&mi->context.c2= .from, &m->top.c2.from); + + if (*floated) + { + /* reset prefix, since here we are not sure peer i= s the one it claims to be */ + ungenerate_prefix(mi); + msg(D_MULTI_MEDIUM, "Float requested for peer %" P= RIu32 " to %s", peer_id, + mroute_addr_print(&real, &gc)); + } } } } -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1078?usp=3Demail To unsubscribe, or for help writing mail filters, visit http://gerrit.openv= pn.net/settings Gerrit-Project: openvpn Gerrit-Branch: master Gerrit-Change-Id: Iecbbcf32c0059f2b16a05333b3794599060d7d6a Gerrit-Change-Number: 1078 Gerrit-PatchSet: 2 Gerrit-Owner: its_Giaan Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: its_Giaan Gerrit-Attention: flichtenheld Gerrit-MessageType: newpatchset --C14eM25G46s= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, its_Giaan, plaistho= s.

its_Giaan uploaded patch set #2 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/1078?usp=3Demail">View Chan= ge

The following approvals got outdated and were removed: Code-Review-1 by plaisthos

Multi-socket: Fix assert triggered by stale peer=
-id reuse

Fixed a bug where clients using different transport
pro= tocols (UDP, TCP) could interfere with each other
after a server restart= .
The issue occurred when a client reused a previously
assigned peer-= id that was now associated with a
different client using a different tra= nsport protocol.

For example, a UDP client could send packets with a=
peer-id now assigned to a TCP client, which lacks
a valid context-&g= t;c2.from which is filled by the
recvfrom(), causing an assert to be tri= ggered.

A protocol check has been added to prevent packets
from d= ifferent protocols from hijacking active
connections.

Github: #77= 3

Change-Id: Iecbbcf32c0059f2b16a05333b3794599060d7d6a
Signed-off= -by: Gianmarco De Gregori <gianmarco@...2726...>
---
M src/open= vpn/mudp.c
1 file changed, 13 insertions(+), 9 deletions(-)

gi=
t pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/78/1078/2
<= pre style=3D"font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
inde= x 93e65e0..f62e0a3 100644
--- a/src/openvpn/mudp.c+++ b/src/openvpn/mudp.c
@@ -216,16 +216,20 @@


if (!peer_id_disabled &&= (peer_id < m->max_clients) && (m->instances[peer_id]))
{
- mi =3D m->instances[peer_id];
-
- *floated =3D !link_socket_actual_match(&mi= ->context.c2.from, &m->top.c2.from);
-
- if (*floated)
+ /* Ensure that clients from previous sessions= do not attempt to
+ = * hijack instances of newly connected clients in multi-prot= ocol scenarios */
+ = if (m->instances[peer_id]->context.c2.link_sockets[0]-&= gt;info.proto =3D=3D sock->info.proto)
= {
- = /* reset prefix, since here we are not sure peer is the one it claims to be= */
- = ungenerate_prefix(mi);
- mroute_addr_print(&real, &= amp;gc));
+ = mi =3D m->instances[peer_id];
+ *floated =3D !link_socket_actual= _match(&mi->context.c2.from, &m->top.c2.from);
+

+ if (*floated)
+ {
+ /* reset pref= ix, since here we are not sure peer is the one it claims to be */+ ungen= erate_prefix(mi);
+ = msg(D_MULTI_MEDIUM, "Float requested for peer %&= quot; PRIu32 " to %s", peer_id,
+ mroute_addr_print(&re= al, &gc));
+ = }
}
= }
}

To v= iew, visit change 1078. To unsubscribe, or for help writing mail filters, visit= settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iecbbcf32c0059f2b16a05333b37= 94599060d7d6a
Gerrit-Change-Number: 1078
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <gianmarco@...2786...= ..>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...= .1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...= ..1227...>
Gerrit-Attention: its_Giaan <gianmarco@...1665...= 726...>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newpatchset
--C14eM25G46s=--