[Openvpn-devel,v1] manage: Correctly handle port 65535 in man_kill

Message ID 20251103115552.6201-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v1] manage: Correctly handle port 65535 in man_kill | expand

Commit Message

Gert Doering Nov. 3, 2025, 11:55 a.m. UTC
From: Frank Lichtenheld <frank@lichtenheld.com>

Commit c66d433111c958c42cc98f4ba12d3cfc1bd5b3b4 introduced
an off-by-one when changing a literal to a constant.

Fixes: #887
Change-Id: I19373408a82332d7b2e5c634e5509c8be3727b5a
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1341
---

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

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

Comments

Gert Doering Nov. 3, 2025, 1:14 p.m. UTC | #1
Trivial fix - and we should have fixed that on the original patch, but
due to time constraints around 2.7_rc1 release it did not work out.

Your patch has been applied to the master branch.

commit 40b29347c05e969dc2d23223a426ce652b123589
Author: Frank Lichtenheld
Date:   Mon Nov 3 12:55:46 2025 +0100

     manage: Correctly handle port 65535 in man_kill

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1341
     Message-Id: <20251103115552.6201-1-gert@greenie.muc.de>
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index e46b5f2..6efa100 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -612,7 +612,7 @@ 
                                       : (streq(p1, "udp")) ? PROTO_UDP
                                                            : PROTO_NONE;
 
-                if ((port > 0 && port < UINT16_MAX) && (proto != PROTO_NONE))
+                if ((port > 0 && port <= UINT16_MAX) && (proto != PROTO_NONE))
                 {
                     n_killed = (*man->persist.callback.kill_by_addr)(man->persist.callback.arg,
                                                                      addr, (uint16_t)port, proto);