[Openvpn-devel,v3] iservice: fix off by one error

Message ID 20251126104938.5612-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v3] iservice: fix off by one error | expand

Commit Message

Gert Doering Nov. 26, 2025, 10:49 a.m. UTC
From: Heiko Hund <heiko@ist.eigentlich.net>

In case there is more than one non-ignored interface domain, the start
of the next domain was off by one glyph. That meant that all but the
first domain was ignored when converting to MULTI_SZ.

Reported-by: Marc Heuse <marc@srlabs.de>
Reported-by: stephan@srlabs.de
Change-Id: I3ebf30f6d9edc66eb54fb3f1b5634c96d156b1ca
Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1395
---

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/+/1395
This mail reflects revision 3 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>

Comments

Gert Doering Nov. 26, 2025, 11:16 a.m. UTC | #1
Looks reasonable, BB compiles.  Tests needed (and not really for this
particular case, but for a more generic function "copy buffer list in
<format a> to a new buffer list in <format b>, with a skip list"
which would get used here... doing this in a single buffer just makes
everything much more complicated, for the gain of saving a single
malloc/free...).

Your patch has been applied to the master branch.

commit dc5baf8039b37095109f22632a2ca02da805b548
Author: Heiko Hund
Date:   Wed Nov 26 11:49:32 2025 +0100

     iservice: fix off by one error

     Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1395
     Message-Id: <20251126104938.5612-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg34678.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 31a7ffa..23d18aa 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -2234,7 +2234,8 @@ 
                     return NO_ERROR;
                 }
 
-                pos = comma + 1;
+                /* Comma pos is now +1 after adding leading dot */
+                pos = comma + 2;
             }
         }
     }