diff mbox series

[Openvpn-devel,v5] openvpnserv: Improve sanity check for addr_len in HandleWINSConfigMessage

Message ID 20260305084610.1038-1-gert@greenie.muc.de
State New
Headers show
Series [Openvpn-devel,v5] openvpnserv: Improve sanity check for addr_len in HandleWINSConfigMessage | expand

Commit Message

Gert Doering March 5, 2026, 8:46 a.m. UTC 
From: Frank Lichtenheld <frank@lichtenheld.com>

Handle the case where the int is negative
explicitly. Zero is probably a safer value
to assume in this case.

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

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

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

Comments

Gert Doering March 6, 2026, 4:18 p.m. UTC | #1 
Stared-at-code, reasonable change.  Make checks explicit.
Compiler happy, BB happy.  One #pragma gone, Gert happy.

Your patch has been applied to the master branch.

commit be26f9a28c38d9c190388d3922db79a3957bb74d
Author: Frank Lichtenheld
Date:   Thu Mar 5 09:46:04 2026 +0100

     openvpnserv: Improve sanity check for addr_len in HandleWINSConfigMessage

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1496
     Message-Id: <20260305084610.1038-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg35923.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 227431a..09c709e 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -1247,11 +1247,6 @@ 
     return err;
 }
 
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#endif
-
 /**
  * Check for a valid search list in a certain key of the registry
  *
@@ -2944,7 +2939,11 @@ 
     int addr_len = msg->addr_len;
 
     /* sanity check */
-    if (addr_len > _countof(msg->addr))
+    if (addr_len < 0)
+    {
+        addr_len = 0;
+    }
+    if ((unsigned int)addr_len > _countof(msg->addr))
     {
         addr_len = _countof(msg->addr);
     }
@@ -3005,10 +3004,6 @@ 
     return err;
 }
 
-#if defined(__GNUC__) || defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
-
 static DWORD
 HandleEnableDHCPMessage(const enable_dhcp_message_t *dhcp)
 {