From: Kristof Provost Date: Tue, 06 Feb 2024 09:37:47 -0700 Message-ID: <419D47E8-C0CE-4380-8896-90C2C6773107@...1376...> In-Reply-To: <20240124152739.28248-1-kprovost@...2661...> References: <20240124152739.28248-1-kprovost@...2661...> MIME-Version: 1.0 Subject: Re: [Openvpn-devel] [PATCH] dco-freebsd: dynamically re-allocate buffer if it's too small List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable To: openvpn-devel Ping? Does this need anything else before it can land? Best regards, Kristof On 24 Jan 2024, at 8:27, Kristof Provost via Openvpn-devel wrote: > From: Kristof Provost > > 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. > > Signed-off-by: Kristof Provost > --- > src/openvpn/dco_freebsd.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/src/openvpn/dco_freebsd.c b/src/openvpn/dco_freebsd.c > index 3ba1c817..577c65f8 100644 > --- a/src/openvpn/dco_freebsd.c > +++ b/src/openvpn/dco_freebsd.c > @@ -698,7 +698,8 @@ dco_get_peer_stats_multi(dco_context_t *dco, struct m= ulti_context *m) > { > > struct ifdrv drv; > - uint8_t buf[4096]; > + uint8_t *buf =3D NULL; > + size_t buf_size =3D 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 =3D OVPN_GET_PEER_STATS; > - drv.ifd_len =3D sizeof(buf); > + > +retry: > + buf =3D realloc(buf, buf_size); > + drv.ifd_len =3D buf_size; > drv.ifd_data =3D buf; > > ret =3D ioctl(dco->fd, SIOCGDRVSPEC, &drv); > + if (ret && errno =3D=3D ENOSPC) > + { > + buf_size *=3D 2; > + goto retry; > + } > + > if (ret) > { > + free(buf); > msg(M_WARN | M_ERRNO, "Failed to get peer stats"); > return -EINVAL; > } > > nvl =3D nvlist_unpack(buf, drv.ifd_len, 0); > + free(buf); > if (!nvl) > { > msg(M_WARN, "Failed to unpack nvlist"); > --=20 > 2.43.0 > > > > _______________________________________________ > Openvpn-devel mailing list > Openvpn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openvpn-devel