From: "flichtenheld (Code Review)" Date: Fri, 16 Jan 2026 14:05:47 +0000 In-Reply-To: References: Reply-To: frank@...2641..., arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, gert@...1296... Message-ID: <64bb4f7a15e8fb59b24b357a35d8a2becdd8b0c1-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="UBfVOg9S978="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: port-share: Check return value of fork() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: plaisthos Cc: openvpn-devel --UBfVOg9S978= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: cron2, flichtenheld, plaisthos. Hello cron2, plaisthos, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/1470?usp=3Demail to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review-1 by cron2 Change subject: port-share: Check return value of fork() ...................................................................... port-share: Check return value of fork() While here, do some small C11 code cleanup. Reported-By: Joshua Rogers Found-By: ZeroPath (https://zeropath.com) Github: openvpn-private-issues#12 Change-Id: I5eac1b31ae40eb957e2c12ca6c37b491fef32847 Signed-off-by: Frank Lichtenheld --- M src/openvpn/ps.c 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/70/1470/2 diff --git a/src/openvpn/ps.c b/src/openvpn/ps.c index ed2d5c9f..e4c5794 100644 --- a/src/openvpn/ps.c +++ b/src/openvpn/ps.c @@ -800,12 +800,9 @@ port_share_open(const char *host, const char *port, const int max_initial_= buf, const char *journal_dir) { - pid_t pid; socket_descriptor_t fd[2]; struct openvpn_sockaddr hostaddr; struct port_share *ps; - int status; - struct addrinfo *ai; ALLOC_OBJ_CLEAR(ps, struct port_share); ps->foreground_fd =3D -1; @@ -814,9 +811,9 @@ /* * Get host's IP address */ - - status =3D - openvpn_getaddrinfo(GETADDR_RESOLVE | GETADDR_FATAL, host, port, 0= , NULL, AF_UNSPEC, &ai); + struct addrinfo *ai; + int status =3D openvpn_getaddrinfo(GETADDR_RESOLVE | GETADDR_FATAL, ho= st, port, + 0, NULL, AF_UNSPEC, &ai); ASSERT(status =3D=3D 0); ASSERT(sizeof(hostaddr.addr) >=3D ai->ai_addrlen); memcpy(&hostaddr.addr.sa, ai->ai_addr, ai->ai_addrlen); @@ -836,19 +833,22 @@ */ if (socketpair(PF_UNIX, SOCK_DGRAM, 0, fd) =3D=3D -1) { - msg(M_WARN, "PORT SHARE: socketpair call failed"); + msg(M_WARN | M_ERRNO, "PORT SHARE: socketpair call failed"); goto error; } /* * Fork off background proxy process. */ - pid =3D fork(); + pid_t pid =3D fork(); - if (pid) + if (pid < 0) { - int status; - + msg(M_WARN | M_ERRNO, "PORT SHARE: fork failed"); + goto error; + } + else if (pid) + { /* * Foreground Process */ @@ -862,7 +862,7 @@ set_cloexec(fd[0]); /* wait for background child process to initialize */ - status =3D recv_control(fd[0]); + int status =3D recv_control(fd[0]); if (status =3D=3D RESPONSE_INIT_SUCCEEDED) { /* note that this will cause possible EAGAIN when writing to -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/1470?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: I5eac1b31ae40eb957e2c12ca6c37b491fef32847 Gerrit-Change-Number: 1470 Gerrit-PatchSet: 2 Gerrit-Owner: flichtenheld Gerrit-Reviewer: cron2 Gerrit-Reviewer: plaisthos Gerrit-CC: openvpn-devel Gerrit-Attention: plaisthos Gerrit-Attention: cron2 Gerrit-Attention: flichtenheld --UBfVOg9S978= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is cur= rently required from: cron2, flichtenheld, plaisthos.

flichtenheld uploaded patch set #2 to this change.

<= p>View C= hange

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

port-share: Check return value of f=
ork()

While here, do some small C11 code cleanup.

Reported-By= : Joshua Rogers <contact@...2949...>
Found-By: ZeroPath (https://z= eropath.com)
Github: openvpn-private-issues#12
Change-Id: I5eac1b31ae= 40eb957e2c12ca6c37b491fef32847
Signed-off-by: Frank Lichtenheld <fran= k@...2641...>
---
M src/openvpn/ps.c
1 file changed, 12 inserti= ons(+), 12 deletions(-)

git pull ssh://gerrit.op=
envpn.net:29418/openvpn refs/changes/70/1470/2
diff --git a/src/ope=
nvpn/ps.c b/src/openvpn/ps.c
index ed2d5c9f..e4c5794 100644=
--- a/src/openvpn/ps.c
+++ b/src/openvpn/p= s.c
@@ -800,12 +800,9 @@
port_share_open(c= onst char *host, const char *port, const int max_initial_buf,
const char *journal_dir)
{
<= span style=3D"color: hsl(0, 100%, 40%);">- pid_t pid;
= socket_descriptor_t fd[2];
struct openvpn_sockaddr = hostaddr;
struct port_share *ps;
- int status;
- struct addrinfo *ai;
=
ALLOC_OBJ_CLEAR(ps, struct port_share);
= ps->foreground_fd =3D -1;
@@ -814,9 +811,9 @@ /*
* Get host's IP address
= */
-=
- status =3D
- openvpn_getaddrinfo(GETADDR= _RESOLVE | GETADDR_FATAL, host, port, 0, NULL, AF_UNSPEC, &ai);<= br>+ struct addrinfo *ai;
+ int status =3D ope= nvpn_getaddrinfo(GETADDR_RESOLVE | GETADDR_FATAL, host, port,
+ = 0, NULL, AF_UNSPEC, &ai);

ASSERT(status =3D=3D= 0);
ASSERT(sizeof(hostaddr.addr) >=3D ai->ai_ad= drlen);
memcpy(&hostaddr.addr.sa, ai->ai_addr, = ai->ai_addrlen);
@@ -836,19 +833,22 @@
= */
if (socketpair(PF_UNIX, SOCK_DGRAM, 0, fd) =3D= =3D -1)
{
- msg(M_WARN, "PORT SHARE: socketpair call failed"= );
+ msg(M_WAR= N | M_ERRNO, "PORT SHARE: socketpair call failed");
goto error;
}

= /*
* Fork off background proxy process.
*/
= - pid =3D fork();
= + pid_t pid =3D fork();

- if (pid)
+ if (pid < 0)
{
- int status;
-
+ msg(M_WARN | M_ERRNO, "PORT SHARE: fork failed= ");
+ got= o error;
+ }
+ else if (pid)<= br>+ {
= /*
* Foreground Process
= */
@@ -862,7 +862,7 @@
set_cl= oexec(fd[0]);

/* wait for backgr= ound child process to initialize */
- status =3D recv_control(fd[0]);
+ int status =3D recv_control(fd[0]= );
if (status =3D=3D RESPONSE_INIT_SUCCEEDED)
{
/* note that this will = cause possible EAGAIN when writing to

T= o view, visit change 1470. To unsubscribe, or for help writing mail filters, vi= sit settings= .

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I5eac1b31ae40eb957e2c12ca6c3= 7b491fef32847
Gerrit-Change-Number: 1470
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <frank@...2723...= .>
Gerrit-Reviewer: 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...>
Gerrit-Attention: cron2 <gert@...1296...>= ;
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
= --UBfVOg9S978=--