Attention is currently required from: flichtenheld, plaisthos, ralf_lici.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1166?usp=email
to look at the new patch set (#2).
Change subject: dco_linux: validate tun interface before fetching stats
......................................................................
dco_linux: validate tun interface before fetching stats
If dco_get_peer_stats() is called with an uninitialized c->c1.tuntap it
results in a segfault. This issue happens when a client who has not
connected to any server:
- has --management and exits,
- has --management and a management interface client issues either
`bytecount` or `status` or
- if SIGUSR2 is sent to it.
Add a check to ensure the tun interface was set up before attempting to
retrieve peer statistics.
Change-Id: I40c11864745cc1619cb9cbf490b168f90feb5eac
Signed-off-by: Ralf Lici <[email protected]>
---
M src/openvpn/dco_linux.c
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/66/1166/2
diff --git a/src/openvpn/dco_linux.c b/src/openvpn/dco_linux.c
index a3907fe..e70b74d 100644
--- a/src/openvpn/dco_linux.c
+++ b/src/openvpn/dco_linux.c
@@ -1139,6 +1139,8 @@
static int
dco_get_peer(dco_context_t *dco, int peer_id, const bool raise_sigusr1_on_err)
{
+ ASSERT(dco);
+
/* peer_id == -1 means "dump all peers", but this is allowed in MP mode
only.
* If it happens in P2P mode it means that the DCO peer was deleted and we
* can simply bail out
@@ -1182,6 +1184,11 @@
int
dco_get_peer_stats(struct context *c, const bool raise_sigusr1_on_err)
{
+ if (!c->c1.tuntap || c->c1.tuntap->dco.ifindex == 0)
+ {
+ return -1;
+ }
+
return dco_get_peer(&c->c1.tuntap->dco, c->c2.tls_multi->dco_peer_id,
raise_sigusr1_on_err);
}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1166?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I40c11864745cc1619cb9cbf490b168f90feb5eac
Gerrit-Change-Number: 1166
Gerrit-PatchSet: 2
Gerrit-Owner: ralf_lici <[email protected]>
Gerrit-Reviewer: cron2 <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-Attention: ralf_lici <[email protected]>
Gerrit-MessageType: newpatchset
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
