[Openvpn-devel,v1] openvpnserv: don't use stale data for NRPT exclude rules

Message ID 20261121094752.28750-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v1] openvpnserv: don't use stale data for NRPT exclude rules |

Commit Message

Gert Doering Nov. 21, 2026, 9:47 a.m. UTC
  From: Heiko Hund <heiko@ist.eigentlich.net>

If the last interface GetNrptExcludeData() looked at was not usable, its
entry was left with the domains set, and SetNrptExcludeRules() created
a rule from it. Clear the unused entry when done.

Change-Id: Ia359824eea8780805a59d19146740afe3630fa0c
Signed-off-by: Heiko Hund <heiko@ist.eigentlich.net>
Acked-by: Razvan Cojocaru <razvanc@mailbox.org>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2233
---

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

Acked-by according to Gerrit (reflected above):
Razvan Cojocaru <razvanc@mailbox.org>
  

Patch

diff --git a/src/openvpnserv/interactive.c b/src/openvpnserv/interactive.c
index 354fe09..24705a9 100644
--- a/src/openvpnserv/interactive.c
+++ b/src/openvpnserv/interactive.c
@@ -2521,13 +2521,13 @@ 
 {
     HKEY v4_itfs = INVALID_HANDLE_VALUE;
     HKEY v6_itfs = INVALID_HANDLE_VALUE;
+    size_t i = 0;
 
     if (!GetInterfacesKey(AF_INET, &v4_itfs) || !GetInterfacesKey(AF_INET6, &v6_itfs))
     {
         goto out;
     }
 
-    size_t i = 0;
     DWORD enum_index = 0;
     while (i < data_size)
     {
@@ -2627,6 +2627,11 @@ 
     }
 
 out:
+    /* Clear data left by an interface that was not usable */
+    if (i < data_size)
+    {
+        ZeroMemory(&data[i], sizeof(data[i]));
+    }
     RegCloseKey(v6_itfs);
     RegCloseKey(v4_itfs);
 }