dco-freebsd: dynamically re-allocate buffer if it's too small
PATCH 1/1 dco-freebsd: dynamically re-allocate buffer if it's too small
From: Kristof Provost <[email protected]...>
It's possible for the buffer we provude for OVPN_GET_PEER_STATS to be too small. Handle the error, re-allocate a larger buffer and try again rather than failing.
--- src/openvpn/dco_freebsd.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
src/openvpn/dco_freebsd.c +14 -2
@@ -698,7 +698,8 @@ dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m) {struct ifdrv drv; -uint8_t buf[4096 ]; +uint8_t *buf =NULL ; +size_t buf_size =4096 ;nvlist_t *nvl;const nvlist_t *const *nvpeers;size_t npeers;
@@ -712,17 +713,28 @@ dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m)CLEAR (drv);snprintf (drv.ifd_name,IFNAMSIZ ,"%s" , dco->ifname); drv.ifd_cmd =OVPN_GET_PEER_STATS ; - drv.ifd_len =sizeof (buf); + +retry: + buf =realloc (buf, buf_size); + drv.ifd_len = buf_size; drv.ifd_data = buf; ret =ioctl (dco->fd,SIOCGDRVSPEC , &drv); +if (ret && errno ==ENOSPC ) + { + buf_size *=2 ; + goto retry; + } +if (ret) { +free (buf);msg (M_WARN |M_ERRNO ,"Failed to get peer stats" );return -EINVAL ; } nvl =nvlist_unpack (buf, drv.ifd_len,0 ); +free (buf);if (!nvl) {msg (M_WARN ,"Failed to unpack nvlist" );
Signature · 1 line
2.43.0
Ping?
Does this need anything else before it can land?
Best regards,
Kristof
Quoted 64 lines · Kristof Provost via Openvpn-devel
From: Kristof Provost <[email protected]...>
It's possible for the buffer we provude for
OVPN_GET_PEER_STATSto be too small. Handle the error, re-allocate a larger buffer and try again rather than failing.Signed-off-by Kristof Provost <[email protected]...>--- src/openvpn/dco_freebsd.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)src/openvpn/dco_freebsd.c +14
-2@@ -698,7 +698,8 @@ dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m) {struct ifdrv drv; -uint8_t buf[4096 ]; +uint8_t *buf =NULL ; +size_t buf_size =4096 ;nvlist_t *nvl;const nvlist_t *const *nvpeers;size_t npeers;@@ -712,17 +713,28 @@ dco_get_peer_stats_multi(dco_context_t *dco, struct multi_context *m)CLEAR (drv);snprintf (drv.ifd_name,IFNAMSIZ ,"%s" , dco->ifname); drv.ifd_cmd =OVPN_GET_PEER_STATS ; - drv.ifd_len =sizeof (buf); + +retry: + buf =realloc (buf, buf_size); + drv.ifd_len = buf_size; drv.ifd_data = buf; ret =ioctl (dco->fd,SIOCGDRVSPEC , &drv); +if (ret && errno ==ENOSPC ) + { + buf_size *=2 ; + goto retry; + } +if (ret) { +free (buf);msg (M_WARN |M_ERRNO ,"Failed to get peer stats" );return -EINVAL ; } nvl =nvlist_unpack (buf, drv.ifd_len,0 ); +free (buf);if (!nvl) {msg (M_WARN ,"Failed to unpack nvlist" );Signature · 8 lines
2.43.0 _______________________________________________ Openvpn-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Hi,
Quoted 3 lines · Kristof Provost
Ping?
Does this need anything else before it can land?
Just time on my side. Busy weeks, apologies. Will handle tomorrow.
gert
Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you
feed honest figures into a computer, honest figures come out. Never doubted
it myself till I met a computer with a sense of humor."
Robert A. Heinlein, The Moon is a Harsh Mistress
Gert Doering - Munich, Germany [email protected]...Stare-at-code looks good :-) - there's one possible catch should realloc() return NULL - in that case we'd pass drv.ifd_data = NULL to the kernel - but I'm reasonably sure the kernel will then not crash but return EINVAL.
I do not have a sufficient number of clients on a FreeBSD 14 system today to trigger the original problem, but I can attest that the new dynamic code will do the right thing - I tested this by reducing the start allocation to 1 byte and see it grow to 1024 (test with 2 clients, 512 sufficient for 1 client).
(Also, master+patch passes the full server test rig on FreeBSD 14)
Your patch has been applied to the master and release/2.6 branch (bugfix)
commit 62676935d738f74908845ca96819a36a8c0c230e (master) commit d8faf568d237667c66141e2c3f6df3f999aa02bd (release/2.6)
Author: Kristof Provost Date: Wed Jan 24 16:27:39 2024 +0100
dco-freebsd: dynamically re-allocate buffer if it's too small
Signed-off-by: Kristof Provost <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg28128.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering