From: "stipa (Code Review)" Date: Tue, 1 Apr 2025 13:51:40 +0000 References: Reply-To: lstipakov@...277..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641... Message-ID: <26ebd4013ab6b45dd73c2693d66eb2defde72342-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="eeZzYpSJW8I="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: dco-win: Fix crash when cancelling pending operation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos , flichtenheld Cc: openvpn-devel --eeZzYpSJW8I= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: flichtenheld, plaisthos. Hello plaisthos, flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/928?usp=3Demail to review the following change. Change subject: dco-win: Fix crash when cancelling pending operation ...................................................................... dco-win: Fix crash when cancelling pending operation The OVERLAPPED structure must remain valid for the entire duration of an asynchronous operation. Previously, when a TCP connection was pending inside the NEW_PEER call, the OVERLAPPED structure was defined as a local variable within dco_p2p_new_peer(). When CancelIo() was called later from close_tun_handle(), the OVERLAPPED structure was already out of scope, resulting in undefined behavior and stack corruption. This fix moves the OVERLAPPED structure to the tuntap struct, ensuring it remains valid throughout the operation's lifetime. GitHub: #715 Change-Id: Ib1db457c42a80f6b8fc0e3ceb4a895d4cf7f0155 Signed-off-by: Lev Stipakov --- M src/openvpn/dco_win.c M src/openvpn/dco_win.h M src/openvpn/socket.c M src/openvpn/tun.h 4 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/28/928/1 diff --git a/src/openvpn/dco_win.c b/src/openvpn/dco_win.c index 8b47124..a386e53 100644 --- a/src/openvpn/dco_win.c +++ b/src/openvpn/dco_win.c @@ -321,7 +321,7 @@ } void -dco_p2p_new_peer(HANDLE handle, struct link_socket *sock, struct signal_in= fo *sig_info) +dco_p2p_new_peer(HANDLE handle, OVERLAPPED *ov, struct link_socket *sock, = struct signal_info *sig_info) { msg(D_DCO_DEBUG, "%s", __func__); @@ -395,8 +395,8 @@ ASSERT(0); } - OVERLAPPED ov =3D { 0 }; - if (!DeviceIoControl(handle, OVPN_IOCTL_NEW_PEER, &peer, sizeof(peer),= NULL, 0, NULL, &ov)) + CLEAR(*ov); + if (!DeviceIoControl(handle, OVPN_IOCTL_NEW_PEER, &peer, sizeof(peer),= NULL, 0, NULL, ov)) { DWORD err =3D GetLastError(); if (err !=3D ERROR_IO_PENDING) @@ -405,7 +405,7 @@ } else { - dco_connect_wait(handle, &ov, get_server_poll_remaining_time(s= ock->server_poll_timeout), sig_info); + dco_connect_wait(handle, ov, get_server_poll_remaining_time(so= ck->server_poll_timeout), sig_info); } } } diff --git a/src/openvpn/dco_win.h b/src/openvpn/dco_win.h index 95c95c8..e8e4e22 100644 --- a/src/openvpn/dco_win.h +++ b/src/openvpn/dco_win.h @@ -63,7 +63,7 @@ dco_mp_start_vpn(HANDLE handle, struct link_socket *sock); void -dco_p2p_new_peer(HANDLE handle, struct link_socket *sock, struct signal_in= fo *sig_info); +dco_p2p_new_peer(HANDLE handle, OVERLAPPED *ov, struct link_socket *sock, = struct signal_info *sig_info); void dco_start_tun(struct tuntap *tt); diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 09de1b0..beb31fa 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -2242,7 +2242,7 @@ } else { - dco_p2p_new_peer(c->c1.tuntap->hand, sock, sig_info); + dco_p2p_new_peer(c->c1.tuntap->hand, &c->c1.tuntap->dco_new_peer_o= v, sock, sig_info); } sock->sockflags |=3D SF_DCO_WIN; diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h index b616f5d..bcc23b4 100644 --- a/src/openvpn/tun.h +++ b/src/openvpn/tun.h @@ -215,6 +215,7 @@ #ifdef _WIN32 HANDLE hand; + OVERLAPPED dco_new_peer_ov; /* used for async NEW_PEER dco call, which= might wait for TCP connect */ struct overlapped_io reads; struct overlapped_io writes; struct rw_handle rw_handle; -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/928?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: Ib1db457c42a80f6b8fc0e3ceb4a895d4cf7f0155 Gerrit-Change-Number: 928 Gerrit-PatchSet: 1 Gerrit-Owner: stipa Gerrit-Reviewer: flichtenheld Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: flichtenheld Gerrit-MessageType: newchange --eeZzYpSJW8I= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: flichtenheld, plaisthos.

stipa would like plaisthos and flichtenheld to review t= his change.

Vi= ew Change

dco-win: Fix crash when cancelling pending operation

T= he OVERLAPPED structure must remain valid for the entire duration of an
= asynchronous operation. Previously, when a TCP connection was pending
in= side the NEW_PEER call, the OVERLAPPED structure was defined as a
local = variable within dco_p2p_new_peer().

When CancelIo() was called later= from close_tun_handle(), the OVERLAPPED
structure was already out of sc= ope, resulting in undefined behavior and
stack corruption.

This f= ix moves the OVERLAPPED structure to the tuntap struct, ensuring
it rema= ins valid throughout the operation's lifetime.

GitHub: #715
<= br>Change-Id: Ib1db457c42a80f6b8fc0e3ceb4a895d4cf7f0155
Signed-off-by: L= ev Stipakov <lev@...515...>
---
M src/openvpn/dco_win.c
M sr= c/openvpn/dco_win.h
M src/openvpn/socket.c
M src/openvpn/tun.h
4 f= iles changed, 7 insertions(+), 6 deletions(-)

git pull ssh://gerr=
it.openvpn.net:29418/openvpn refs/changes/28/928/1
diff --git a/src=
/openvpn/dco_win.c b/src/openvpn/dco_win.c
index 8b47124..a= 386e53 100644
--- a/src/openvpn/dco_win.c
+= ++ b/src/openvpn/dco_win.c
@@ -321,7 +321,7 @@
}

void
-dco_p2p_new_peer(HANDLE handle, struct link_socket= *sock, struct signal_info *sig_info)
+dco_p2p_new_peer(HANDLE handle, OVERLAPPED *ov, struct li= nk_socket *sock, struct signal_info *sig_info)
{ msg(D_DCO_DEBUG, "%s", __func__);

@@ -395,8 +395,8 @@
ASSERT(0);
}

- OVERLAPPED ov =3D { 0 };
- if (!DeviceIoControl(handle, OVPN_IOCTL_NEW_PEER,= &peer, sizeof(peer), NULL, 0, NULL, &ov))
+ CLEAR(*ov);
+ if (!DeviceIoControl(handle, OVPN_IOCTL_NEW_= PEER, &peer, sizeof(peer), NULL, 0, NULL, ov))
{
DWORD err =3D GetLastError();
= if (err !=3D ERROR_IO_PENDING)
@@ -405,7 +405,7 @@
}
else
= {
- dco_c= onnect_wait(handle, &ov, get_server_poll_remaining_time(sock->server= _poll_timeout), sig_info);
+ dco_connect_wait(handle, ov, get_server_poll_remaining_t= ime(sock->server_poll_timeout), sig_info);
}

}
}
diff --git a/src/op= envpn/dco_win.h b/src/openvpn/dco_win.h
index 95c95c8..e8e4= e22 100644
--- a/src/openvpn/dco_win.h
+++ = b/src/openvpn/dco_win.h
@@ -63,7 +63,7 @@
= dco_mp_start_vpn(HANDLE handle, struct link_socket *sock);
=
void
-dco_p2p_new_peer(HANDLE handle, struct link_socket *sock, struct signal_i= nfo *sig_info);
+dco_= p2p_new_peer(HANDLE handle, OVERLAPPED *ov, struct link_socket *sock, struc= t signal_info *sig_info);

void dco_start_tun(struct tuntap *tt);
diff --git a/src/= openvpn/socket.c b/src/openvpn/socket.c
index 09de1b0..beb3= 1fa 100644
--- a/src/openvpn/socket.c
+++ b= /src/openvpn/socket.c
@@ -2242,7 +2242,7 @@
}
else
{
- dco_p2p_new_peer(c->c1.tuntap= ->hand, sock, sig_info);
+ dco_p2p_new_peer(c->c1.tuntap->hand, &c->c1.tu= ntap->dco_new_peer_ov, sock, sig_info);
} sock->sockflags |=3D SF_DCO_WIN;
diff --git a/src/openvpn/tun.h b/src/openvpn/tun.h
i= ndex b616f5d..bcc23b4 100644
--- a/src/openvpn/tun.h=
+++ b/src/openvpn/tun.h
@@ -215,6 +215,7 @@


#ifdef _WIN32
HANDLE han= d;
+ OVERLAPPED dc= o_new_peer_ov; /* used for async NEW_PEER dco call, which might wait for TC= P connect */
struct overlapped_io reads;
struct overlapped_io writes;
struct rw_handle = rw_handle;

To view, visit change 928. To uns= ubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib1db457c42a80f6b8fc0e3ceb4a= 895d4cf7f0155
Gerrit-Change-Number: 928
Gerrit-PatchSet: 1
Gerrit-Owner: stipa <lstipakov@...277...>= ;
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: flichtenheld <frank@...2375...= 41...>
Gerrit-MessageType: newchange
--eeZzYpSJW8I=--