Change in openvpn[master]: dco-win: Fix crash when cancelling pending operation
A message that is not in the archive (sent off-list or not yet received): gerrit.1743515497000.Ib1db457c42a80f6b8fc0e3ceb4a895d4cf7f0155@...2715...
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=email
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
---
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
src/openvpn/dco_win.c +4 -4
@@ -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 link_socket *sock,struct signal_info *sig_info) {msg (D_DCO_DEBUG ,"%s" , __func__);
@@ -395,8 +395,8 @@ASSERT (0 ); } -OVERLAPPED ov = {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 =GetLastError ();if (err !=ERROR_IO_PENDING )
@@ -405,7 +405,7 @@ }else { -dco_connect_wait (handle, &ov,get_server_poll_remaining_time (sock->server_poll_timeout), sig_info); +dco_connect_wait (handle, ov,get_server_poll_remaining_time (sock->server_poll_timeout), sig_info); } } }
src/openvpn/dco_win.h +1 -1
@@ -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_info *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);
src/openvpn/socket.c +1 -1
@@ -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_ov, sock, sig_info); } sock->sockflags |=SF_DCO_WIN ;
src/openvpn/tun.h +1 -0
@@ -215,6 +215,7 @@#ifdef _WIN32HANDLE 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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib1db457c42a80f6b8fc0e3ceb4a895d4cf7f0155
Gerrit-Change-Number: 928
Gerrit-PatchSet: 1
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos, stipa.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/928?usp=email )
Change subject: dco-win: Fix crash when cancelling pending operation
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Patchset:
PS1:
good catch...
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/928?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib1db457c42a80f6b8fc0e3ceb4a895d4cf7f0155
Gerrit-Change-Number: 928
Gerrit-PatchSet: 1
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Tue, 01 Apr 2025 18:15:15 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH 1/1 dco-win: Fix crash when cancelling pending operation
In reply to a message not in the archiveFrom: Lev Stipakov <[email protected]...>
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
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/928
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/dco_win.c +4 -4
@@ -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 link_socket *sock,struct signal_info *sig_info) {msg (D_DCO_DEBUG ,"%s" , __func__);
@@ -395,8 +395,8 @@ASSERT (0 ); } -OVERLAPPED ov = {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 =GetLastError ();if (err !=ERROR_IO_PENDING )
@@ -405,7 +405,7 @@ }else { -dco_connect_wait (handle, &ov,get_server_poll_remaining_time (sock->server_poll_timeout), sig_info); +dco_connect_wait (handle, ov,get_server_poll_remaining_time (sock->server_poll_timeout), sig_info); } } }
src/openvpn/dco_win.h +1 -1
@@ -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_info *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);
src/openvpn/socket.c +1 -1
@@ -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_ov, sock, sig_info); } sock->sockflags |=SF_DCO_WIN ;
src/openvpn/tun.h +1 -0
@@ -215,6 +215,7 @@#ifdef _WIN32HANDLE 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;
[Openvpn-devel] [PATCH applied] Re: dco-win: Fix crash when cancelling pending operation
I haven't tested it, just stared at the code, and test compiled with mingw. The change itself is straightforward - move the OVERLAPPED structure inside struct tuntap, so it will share the same lifetime (diagnosing this from a crash trying to close tt->hand is more impressive ;-) )
Reference URLs point to the sf.net list archive again, because mail-archive.org is refusing to acknowledge existence of this mail...
Your patch has been applied to the master branch.
commit f60a49362515a87ccf8db406ef422499adf34eb7
Author: Lev Stipakov Date: Tue Apr 1 20:15:30 2025 +0200
dco-win: Fix crash when cancelling pending operation
Signed-off-by: Lev Stipakov <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://sourceforge.net/p/openvpn/mailman/message/59168247/
URL: https://gerrit.openvpn.net/c/openvpn/+/928
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
PATCH 1/1 dco-win: Fix crash when cancelling pending operation
In reply to a message not in the archiveFrom: Lev Stipakov <[email protected]...>
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
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/928
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpn/dco_win.c +4 -4
@@ -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 link_socket *sock,struct signal_info *sig_info) {msg (D_DCO_DEBUG ,"%s" , __func__);
@@ -395,8 +395,8 @@ASSERT (0 ); } -OVERLAPPED ov = {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 =GetLastError ();if (err !=ERROR_IO_PENDING )
@@ -405,7 +405,7 @@ }else { -dco_connect_wait (handle, &ov,get_server_poll_remaining_time (sock->server_poll_timeout), sig_info); +dco_connect_wait (handle, ov,get_server_poll_remaining_time (sock->server_poll_timeout), sig_info); } } }
src/openvpn/dco_win.h +1 -1
@@ -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_info *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);
src/openvpn/socket.c +1 -1
@@ -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_ov, sock, sig_info); } sock->sockflags |=SF_DCO_WIN ;
src/openvpn/tun.h +1 -0
@@ -215,6 +215,7 @@#ifdef _WIN32HANDLE 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;
cron2 has uploaded a new patch set (#2) to the change originally created by stipa. ( http://gerrit.openvpn.net/c/openvpn/+/928?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
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: closes OpenVPN/openvpn#715
Message-Id: <[email protected]...>
URL: https://sourceforge.net/p/openvpn/mailman/message/59168247/
URL: https://gerrit.openvpn.net/c/openvpn/+/928
---
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/2
src/openvpn/dco_win.c +4 -4
@@ -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 link_socket *sock,struct signal_info *sig_info) {msg (D_DCO_DEBUG ,"%s" , __func__);
@@ -395,8 +395,8 @@ASSERT (0 ); } -OVERLAPPED ov = {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 =GetLastError ();if (err !=ERROR_IO_PENDING )
@@ -405,7 +405,7 @@ }else { -dco_connect_wait (handle, &ov,get_server_poll_remaining_time (sock->server_poll_timeout), sig_info); +dco_connect_wait (handle, ov,get_server_poll_remaining_time (sock->server_poll_timeout), sig_info); } } }
src/openvpn/dco_win.h +1 -1
@@ -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_info *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);
src/openvpn/socket.c +1 -1
@@ -2247,7 +2247,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_ov, sock, sig_info); } sock->sockflags |=SF_DCO_WIN ;
src/openvpn/tun.h +1 -0
@@ -215,6 +215,7 @@#ifdef _WIN32HANDLE 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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib1db457c42a80f6b8fc0e3ceb4a895d4cf7f0155
Gerrit-Change-Number: 928
Gerrit-PatchSet: 2
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/928?usp=email )
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: closes OpenVPN/openvpn#715
Message-Id: <[email protected]...>
URL: https://sourceforge.net/p/openvpn/mailman/message/59168247/
URL: https://gerrit.openvpn.net/c/openvpn/+/928
---
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(-)
src/openvpn/dco_win.c +4 -4
@@ -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 link_socket *sock,struct signal_info *sig_info) {msg (D_DCO_DEBUG ,"%s" , __func__);
@@ -395,8 +395,8 @@ASSERT (0 ); } -OVERLAPPED ov = {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 =GetLastError ();if (err !=ERROR_IO_PENDING )
@@ -405,7 +405,7 @@ }else { -dco_connect_wait (handle, &ov,get_server_poll_remaining_time (sock->server_poll_timeout), sig_info); +dco_connect_wait (handle, ov,get_server_poll_remaining_time (sock->server_poll_timeout), sig_info); } } }
src/openvpn/dco_win.h +1 -1
@@ -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_info *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);
src/openvpn/socket.c +1 -1
@@ -2247,7 +2247,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_ov, sock, sig_info); } sock->sockflags |=SF_DCO_WIN ;
src/openvpn/tun.h +1 -0
@@ -215,6 +215,7 @@#ifdef _WIN32HANDLE 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=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ib1db457c42a80f6b8fc0e3ceb4a895d4cf7f0155
Gerrit-Change-Number: 928
Gerrit-PatchSet: 2
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged