From: "its_Giaan (Code Review)"
Date: Tue, 28 Jan 2025 15:07:02 +0000
In-Reply-To:
References:
Reply-To: gianmarco@...2726..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...,
gert@...1296..., a@...2181...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="qCwKNi1WwEM="; charset=UTF-8
Subject: [Openvpn-devel] [M] Change in openvpn[master]: mroute/management:
fix uninitialized variable (UNINIT)
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos , cron2 , flichtenheld
Cc: openvpn-devel
--qCwKNi1WwEM=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, its_Giaan, plais=
thos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/880?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: mroute/management: fix uninitialized variable (UNINIT)
......................................................................
mroute/management: fix uninitialized variable (UNINIT)
Fix issue reported by Coverity:
CID 1641564: Uninitialized variables (UNINIT)
Using unitialized value "maddr.proto" when
calling "mroute_addr_equal()".
Fix this by passing the proto along with
IP:port.
While at it, changed the
mroute_addr_print_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses when
MR_WITH_PORT is not specified.
Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Signed-off-by: Gianmarco De Gregori
---
M Changes.rst
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn/manage.h
M src/openvpn/mroute.c
M src/openvpn/mroute.h
M src/openvpn/mtcp.c
M src/openvpn/multi.c
8 files changed, 42 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/80/880/2
diff --git a/Changes.rst b/Changes.rst
index 16ae6fc..d01816b 100644
--- a/Changes.rst
+++ b/Changes.rst
@@ -317,6 +317,9 @@
settings will contradict the setting of allow-compression as this almost
always results in a non-working connection.
+- The "kill" by addr management command now requires also the protocol
+ as string e.g. "udp", "tcp".
+
Common errors with OpenSSL 3.0 and OpenVPN 2.6
----------------------------------------------
Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable, so some
diff --git a/doc/management-notes.txt b/doc/management-notes.txt
index b55135a..f8150ba 100644
--- a/doc/management-notes.txt
+++ b/doc/management-notes.txt
@@ -205,8 +205,9 @@
kill Test-Client -- kill the client instance having a
common name of "Test-Client".
- kill 1.2.3.4:4000 -- kill the client instance having a
- source address and port of 1.2.3.4:4000
+ kill 1.2.3.4:4000:tcp -- kill the client instance having a
+ source address, port and proto of
+ 1.2.3.4:4000:tcp
Use the "status" command to see which clients are connected.
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index 0c77f85..8c91c25 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -544,13 +544,15 @@
struct buffer buf;
char p1[128];
char p2[128];
+ char p3[128];
int n_killed;
buf_set_read(&buf, (uint8_t *) victim, strlen(victim) + 1);
buf_parse(&buf, ':', p1, sizeof(p1));
buf_parse(&buf, ':', p2, sizeof(p2));
+ buf_parse(&buf, ':', p3, sizeof(p3));
- if (strlen(p1) && strlen(p2))
+ if (strlen(p1) && strlen(p2) && strlen(p3))
{
/* IP:port specified */
bool status;
@@ -558,26 +560,30 @@
if (status)
{
const int port =3D atoi(p2);
- if (port > 0 && port < 65536)
+ const int proto =3D (streq(p3, "tcp")) ? PROTO_TCP_SERVER =
: ascii2proto(p3);
+
+ if ((port > 0 && port < 65536) && (proto > 0 && proto < PR=
OTO_N))
{
- n_killed =3D (*man->persist.callback.kill_by_addr)(man=
->persist.callback.arg, addr, port);
+ n_killed =3D (*man->persist.callback.kill_by_addr)(man=
->persist.callback.arg, addr, port, proto);
if (n_killed > 0)
{
- msg(M_CLIENT, "SUCCESS: %d client(s) at address %s=
:%d killed",
+ msg(M_CLIENT, "SUCCESS: %d client(s) at address %s=
:%s:%d killed",
n_killed,
+ proto2ascii(proto, AF_INET, true),
print_in_addr_t(addr, 0, &gc),
port);
}
else
{
- msg(M_CLIENT, "ERROR: client at address %s:%d not =
found",
+ msg(M_CLIENT, "ERROR: client at address %s:%s:%d n=
ot found",
+ proto2ascii(proto, AF_INET, true),
print_in_addr_t(addr, 0, &gc),
port);
}
}
else
{
- msg(M_CLIENT, "ERROR: port number is out of range: %s"=
, p2);
+ msg(M_CLIENT, "ERROR: port number or protocol out of r=
ange: %s %s", p2, p3);
}
}
else
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h
index f501543..02ceb82 100644
--- a/src/openvpn/manage.h
+++ b/src/openvpn/manage.h
@@ -180,7 +180,7 @@
void (*status) (void *arg, const int version, struct status_output *so=
);
void (*show_net) (void *arg, const int msglevel);
int (*kill_by_cn) (void *arg, const char *common_name);
- int (*kill_by_addr) (void *arg, const in_addr_t addr, const int port);
+ int (*kill_by_addr) (void *arg, const in_addr_t addr, const int port, =
const int proto);
void (*delete_event) (void *arg, event_t event);
int (*n_clients) (void *arg);
bool (*send_cc_message) (void *arg, const char *message, const char *p=
arameter);
diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c
index 74923cf..24b9543 100644
--- a/src/openvpn/mroute.c
+++ b/src/openvpn/mroute.c
@@ -276,6 +276,10 @@
addr->len =3D 6;
addr->v4.addr =3D osaddr->addr.in4.sin_addr.s_addr;
addr->v4.port =3D osaddr->addr.in4.sin_port;
+ if (addr->proto !=3D PROTO_NONE)
+ {
+ addr->type |=3D MR_WITH_PROTO;
+ }
}
else
{
@@ -295,6 +299,10 @@
addr->len =3D 18;
addr->v6.addr =3D osaddr->addr.in6.sin6_addr;
addr->v6.port =3D osaddr->addr.in6.sin6_port;
+ if (addr->proto !=3D PROTO_NONE)
+ {
+ addr->type |=3D MR_WITH_PROTO;
+ }
}
else
{
@@ -403,6 +411,10 @@
{
buf_printf(&out, "ARP/");
}
+ if (maddr.type & MR_WITH_PROTO)
+ {
+ buf_printf(&out, "%s:", proto2ascii(maddr.proto, AF_IN=
ET, false));
+ }
buf_printf(&out, "%s", print_in_addr_t(ntohl(maddr.v4.addr=
),
(flags & MAPF_IA_EM=
PTY_IF_UNDEF) ? IA_EMPTY_IF_UNDEF : 0, gc));
if (maddr.type & MR_WITH_NETBITS)
@@ -426,6 +438,10 @@
case MR_ADDR_IPV6:
{
+ if (maddr.type & MR_WITH_PROTO)
+ {
+ buf_printf(&out, "%s:", proto2ascii(maddr.proto, AF_IN=
ET6, false));
+ }
if (IN6_IS_ADDR_V4MAPPED( &maddr.v6.addr ) )
{
buf_printf(&out, "%s", print_in_addr_t(maddr.v4mappedv=
6.addr,
@@ -454,7 +470,6 @@
buf_printf(&out, "UNKNOWN");
break;
}
- buf_printf(&out, "|%d", maddr.proto);
return BSTR(&out);
}
else
diff --git a/src/openvpn/mroute.h b/src/openvpn/mroute.h
index 2659695..fbe102a 100644
--- a/src/openvpn/mroute.h
+++ b/src/openvpn/mroute.h
@@ -72,6 +72,9 @@
/* Indicates than IPv4 addr was extracted from ARP packet */
#define MR_ARP 16
+/* Address type mask indicating that proto # is part of address */
+#define MR_WITH_PROTO 32
+
struct mroute_addr {
uint8_t len; /* length of address */
uint8_t proto;
diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c
index 62ed044..9a8b1cb 100644
--- a/src/openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ -111,6 +111,7 @@
ASSERT(mi->context.c2.link_sockets[0]->info.lsa->actual.dest.addr.sa.s=
a_family =3D=3D AF_INET
|| mi->context.c2.link_sockets[0]->info.lsa->actual.dest.addr.s=
a.sa_family =3D=3D AF_INET6
);
+ mi->real.proto =3D mi->context.c2.link_sockets[0]->info.proto;
if (!mroute_extract_openvpn_sockaddr(&mi->real,
&mi->context.c2.link_sockets[0]->=
info.lsa->actual.dest,
true))
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c
index 9c8c014..b0e1941 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c
@@ -794,7 +794,6 @@
{
goto err;
}
- mi->real.proto =3D ls->info.proto;
generate_prefix(mi);
}
@@ -3942,7 +3941,8 @@
}
static int
-management_callback_kill_by_addr(void *arg, const in_addr_t addr, const in=
t port)
+management_callback_kill_by_addr(void *arg, const in_addr_t addr,
+ const int port, const int proto)
{
struct multi_context *m =3D (struct multi_context *) arg;
struct hash_iterator hi;
@@ -3957,6 +3957,7 @@
saddr.addr.in4.sin_port =3D htons(port);
if (mroute_extract_openvpn_sockaddr(&maddr, &saddr, true))
{
+ maddr.proto =3D proto;
hash_iterator_init(m->iter, &hi);
while ((he =3D hash_iterator_next(&hi)))
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/880?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan
Gerrit-Reviewer: cron2
Gerrit-Reviewer: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-CC: ordex
Gerrit-Attention: plaisthos
Gerrit-Attention: cron2
Gerrit-Attention: its_Giaan
Gerrit-Attention: flichtenheld
Gerrit-MessageType: newpatchset
--qCwKNi1WwEM=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, its_Giaan, p=
laisthos.
its_Giaan uploaded patch set #2 to this change.
<=
a href=3D"http://gerrit.openvpn.net/c/openvpn/+/880?usp=3Demail">View Chang=
e
The following approvals got outdated and were removed:
Code-Review-1 by cron2
mroute/management: fix uninitialized variable (UNINI=
T)
Fix issue reported by Coverity:
CID 1641564: Uninitialized var=
iables (UNINIT)
Using unitialized value "maddr.proto" when
=
calling "mroute_addr_equal()".
Fix this by passing the pro=
to along with
IP:port.
While at it, changed the
mroute_addr_pr=
int_ex() format to display
the protocol only in case of MR_WITH_PROTO
avoid doing it on virtual addresses when
MR_WITH_PORT is not specified.=
Change-Id: I4be0ff4d308213d2ef8ba66bd3178eee1f60fff1
Signed-off-=
by: Gianmarco De Gregori <gianmarco@...2726...>
---
M Changes.r=
st
M doc/management-notes.txt
M src/openvpn/manage.c
M src/openvpn=
/manage.h
M src/openvpn/mroute.c
M src/openvpn/mroute.h
M src/open=
vpn/mtcp.c
M src/openvpn/multi.c
8 files changed, 42 insertions(+), 1=
2 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn re=
fs/changes/80/880/2
diff --git a/Changes.rst b/Changes.rstindex 16ae6fc..d01816b 100644
--- a/Changes.rst
+++ b/Changes.rst
@@ -317,6 +317,9 @@ settings will contradict the setting of allow-compression as thi=
s almost
always results in a non-working connection.
+- The=
"kill" by addr management command now requires also the protocol=
+ as string e.g. &q=
uot;udp", "tcp".
+
Common errors with OpenSSL 3.0 and OpenVPN 2.=
6
----------------------------------------------
Both OpenVPN 2.6 and OpenSSL 3.0 tighten the security considerable,=
so some
diff --git a/doc/management-notes.txt b/doc/manage=
ment-notes.txt
index b55135a..f8150ba 100644
--- a/doc/management-notes.txt
+++ b/doc/management-notes=
.txt
@@ -205,8 +205,9 @@
=
kill Test-Client -- kill the client instance having a
=
common name of "Test-Client".
- kill 1.2.3.4:4000 -- kill the clie=
nt instance having a
- =
source address and port of 1.2.3.4:4000
+ kill 1.2.3.4:4000:tcp -- kill t=
he client instance having a
+ source address, port and proto of
+ =
1.2.3.4:4000:tcp
Use the "status&=
quot; command to see which clients are connected.
<=
br>diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index 0c77f85..8c91c25 100644
--- a/src/openvpn/mana=
ge.c
+++ b/src/openvpn/manage.c
@@ -544,13 =
+544,15 @@
struct buffer buf;
=
char p1[128];
char p2[128];
+ char p3[128];
int n_killed;
buf_set_=
read(&buf, (uint8_t *) victim, strlen(victim) + 1);
=
buf_parse(&buf, ':', p1, sizeof(p1));
=
buf_parse(&buf, ':', p2, sizeof(p2));
+ buf_parse(&buf, ':'=
, p3, sizeof(p3));
- if (strlen(p1) && strlen(p2))
+ if (strlen(p1) && =
strlen(p2) && strlen(p3))
{
/* IP:port specified */
bool st=
atus;
@@ -558,26 +560,30 @@
if=
(status)
{
c=
onst int port =3D atoi(p2);
- if (port > 0 && port < 65536)
+ const int pro=
to =3D (streq(p3, "tcp")) ? PROTO_TCP_SERVER : ascii2proto(p3);=
span>
+
+ if ((port > 0 &&a=
mp; port < 65536) && (proto > 0 && proto < PROTO_N=
))
{
- n_killed =3D (*man->persist.callback=
.kill_by_addr)(man->persist.callback.arg, addr, port);
+ n_killed =3D (*ma=
n->persist.callback.kill_by_addr)(man->persist.callback.arg, addr, po=
rt, proto);
if (n_killed > 0)
{
- msg(M_CLIENT, "SUCCESS: %d client(=
s) at address %s:%d killed",
+ msg(M_CLIENT, "SUCCESS: %d clien=
t(s) at address %s:%s:%d killed",
=
n_killed,
+ =
proto2ascii(proto, AF_INET, true),
print_in_addr_t(addr, 0, &gc), port);
=
}
else
=
{
- =
msg(M_CLIENT, "ERROR: client at address %s:%d not foun=
d",
+ =
msg(M_CLIENT, "ERROR: client at address %s:%s:%d not foun=
d",
+ =
proto2ascii(proto, AF_INET, true),
=
print_in_addr_t(addr, 0, &gc),
=
port);
}
}
else
{
- msg(M_CLIENT, "ERROR: port number is out =
of range: %s", p2);
+ msg(M_CLIENT, "ERROR: port number or protocol=
out of range: %s %s", p2, p3);
}
}
else
diff --git a/src/openvpn/manage.h b/src/openvpn/manage.h
index f501543..02ceb82 100644
--- a/src/openvpn/manage.h=
span>
+++ b/src/openvpn/manage.h
@@ -180,7 +180,7 =
@@
void (*status) (void *arg, const int version, struc=
t status_output *so);
void (*show_net) (void *arg, con=
st int msglevel);
int (*kill_by_cn) (void *arg, const =
char *common_name);
- =
int (*kill_by_addr) (void *arg, const in_addr_t addr, const int port);
+ int (*kill_by_addr=
) (void *arg, const in_addr_t addr, const int port, const int proto);
void (*delete_event) (void *arg, event_t event);
=
int (*n_clients) (void *arg);
bool (*send_c=
c_message) (void *arg, const char *message, const char *parameter);<=
br>diff --git a/src/openvpn/mroute.c b/src/openvpn/mroute.c
index 74923cf..24b9543 100644
--- a/src/openvpn/mrou=
te.c
+++ b/src/openvpn/mroute.c
@@ -276,6 +=
276,10 @@
addr->len =3D 6;
addr->v4.addr =3D osaddr->addr.in4.sin_addr.s_ad=
dr;
addr->v4.port =3D osaddr->addr.i=
n4.sin_port;
+ =
if (addr->proto !=3D PROTO_NONE)
+ {
+ addr->type |=3D MR_WITH_PROTO=
;
+ }<=
/span>
}
else
=
{
@@ -295,6 +299,10 @@
=
addr->len =3D 18;
addr-=
>v6.addr =3D osaddr->addr.in6.sin6_addr;
=
addr->v6.port =3D osaddr->addr.in6.sin6_port;
+ if (addr->proto !=
=3D PROTO_NONE)
+ =
{
+ =
addr->type |=3D MR_WITH_PROTO;
+ }
=
}
else
{@@ -403,6 +411,10 @@
{
<=
span> buf_printf(&out, "ARP/");
}
+ if (maddr.type & MR_WITH_PROTO)
+ {
+ buf_printf(&out=
, "%s:", proto2ascii(maddr.proto, AF_INET, false));
+ }
buf_printf(&out, "%s", print_in_addr_t(ntoh=
l(maddr.v4.addr),
=
(flags & MAPF_IA_EMPTY_IF_UNDEF) ? IA_EMPTY_IF_UNDEF : 0=
, gc));
if (maddr.type & MR_WITH_NETBI=
TS)
@@ -426,6 +438,10 @@
=
case MR_ADDR_IPV6:
{
+ if (maddr.type &=
amp; MR_WITH_PROTO)
+=
{
+ =
buf_printf(&out, "%s:", proto2ascii(maddr.p=
roto, AF_INET6, false));
+ }
if (IN6_IS_ADDR_V4M=
APPED( &maddr.v6.addr ) )
{
=
buf_printf(&out, "%s", print_in_ad=
dr_t(maddr.v4mappedv6.addr,
@@ -454,7 +470,6 @@
<=
span> buf_printf(&out, "UNKNOWN");
=
break;
}
- buf_printf(&out, "|%d&q=
uot;, maddr.proto);
return BSTR(&out);<=
br> }
else
diff --git a/src/=
openvpn/mroute.h b/src/openvpn/mroute.h
index 2659695..fbe1=
02a 100644
--- a/src/openvpn/mroute.h
+++ b=
/src/openvpn/mroute.h
@@ -72,6 +72,9 @@
/*=
Indicates than IPv4 addr was extracted from ARP packet */
=
#define MR_ARP 16
+/* Address type mask indicating that pro=
to # is part of address */
+#define MR_WITH_PROTO 32
+
struct mroute_addr {
uint8_t len; /* length of address */
uint8_=
t proto;
diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp=
.c
index 62ed044..9a8b1cb 100644
--- a/src/=
openvpn/mtcp.c
+++ b/src/openvpn/mtcp.c
@@ =
-111,6 +111,7 @@
ASSERT(mi->context.c2.link_sockets=
[0]->info.lsa->actual.dest.addr.sa.sa_family =3D=3D AF_INET
|| mi->context.c2.link_sockets[0]->info.lsa->ac=
tual.dest.addr.sa.sa_family =3D=3D AF_INET6
);<=
/span>
+ mi->real.prot=
o =3D mi->context.c2.link_sockets[0]->info.proto;
=
if (!mroute_extract_openvpn_sockaddr(&mi->real,
=
&mi->context.c2.link_sockets=
[0]->info.lsa->actual.dest,
=
true))
diff --git a/src/openvpn/multi.c b/=
src/openvpn/multi.c
index 9c8c014..b0e1941 100644
--- a/src/openvpn/multi.c
+++ b/src/openvpn/multi.c<=
/span>
@@ -794,7 +794,6 @@
{
goto err;
}
- mi->real.proto =3D ls->info.p=
roto;
generate_prefix(mi);
}<=
/span>
@@ -3942,7 +3941,8 @@
}<=
/span>
static int
-management_callback_kill_by_addr(void *arg, const i=
n_addr_t addr, const int port)
+management_callback_kill_by_addr(void *arg, const in_addr_t addr=
,
+ =
const int port, const int proto)
{ struct multi_context *m =3D (struct multi_context *) arg;
struct hash_iterator hi;
@@ -3957,6 +3957,=
7 @@
saddr.addr.in4.sin_port =3D htons(port); if (mroute_extract_openvpn_sockaddr(&maddr, &saddr, tr=
ue))
{
+ maddr.proto =3D proto;
hash_iterat=
or_init(m->iter, &hi);
while ((he =3D hash_=
iterator_next(&hi)))
{
=
To view, visit change 880. To unsubscribe, or for help writing mail=
filters, visit settings=
.
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I4be0ff4d308213d2ef8ba66bd31=
78eee1f60fff1
Gerrit-Change-Number: 880
Gerrit-PatchSet: 2
Gerrit-Owner: its_Giaan <gianmarco@...2786...=
..>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...=
1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
Gerrit-CC: ordex <a@...2181...>
Gerrit-Attention: plaisthos <arne-openvpn@...220...=
..1227...>
Gerrit-Attention: cron2 <gert@...1296...>=
;
Gerrit-Attention: its_Giaan <gianmarco@...1665...=
726...>
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-MessageType: newpatchset
--qCwKNi1WwEM=--