Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
MIME-Version: 1.0
References: <20220214131451.2397549-1-fontaine.fabrice@gmail.com> <562900D8-1A46-46E4-B31E-FD3FBE9BE2D8@holtmann.org>
In-Reply-To: <562900D8-1A46-46E4-B31E-FD3FBE9BE2D8@holtmann.org>
From:   Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date:   Mon, 14 Feb 2022 16:21:13 +0100
Message-ID: <CAPi7W81q86a1dOm+K+tiOQNhqYa3FKRj_K+TSyfJgsXazMjLPQ@mail.gmail.com>
Subject: Re: [PATCH BlueZ] fix build with glibc < 2.25
To:     Marcel Holtmann <marcel@holtmann.org>
Cc:     linux-bluetooth@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Marcel,

Le lun. 14 f=C3=A9vr. 2022 =C3=A0 15:14, Marcel Holtmann <marcel@holtmann.o=
rg> a =C3=A9crit :
>
> Hi Fabrice,
>
> > getrandom and sys/random.h are only available since glibc 2.25:
> > https://www.gnu.org/software/gnulib/manual/html_node/sys_002frandom_002=
eh.html
> > resulting in the following build failures since version 5.63 and
> > https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=3Dgrep&q=3Dg=
etrandom
> > so put back rand() as a fallback:
> >
> > plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or di=
rectory
> > #include <sys/random.h>
> >                        ^
> >
> > Fixes:
> > - http://autobuild.buildroot.org/results/6b8870d12e0804d6154230a7322c49=
416c1dc0e2
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> > configure.ac           |  2 ++
> > emulator/le.c          |  7 +++++++
> > emulator/phy.c         |  7 +++++++
> > peripheral/main.c      | 10 ++++++++++
> > plugins/autopair.c     |  6 ++++++
> > profiles/health/hdp.c  | 11 +++++++++++
> > profiles/health/mcap.c | 10 ++++++++++
> > tools/btgatt-server.c  |  6 ++++++
> > 8 files changed, 59 insertions(+)
> >
> > diff --git a/configure.ac b/configure.ac
> > index 07d068a4d..cdd693da3 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -54,6 +54,8 @@ AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threa=
ds],
> >
> > AC_CHECK_FUNCS(explicit_bzero)
> >
> > +AC_CHECK_FUNCS(getrandom)
> > +
> > AC_CHECK_FUNCS(rawmemchr)
> >
> > AC_CHECK_FUNC(signalfd, dummy=3Dyes,
> > diff --git a/emulator/le.c b/emulator/le.c
> > index f8f313f2c..9ef0636d0 100644
> > --- a/emulator/le.c
> > +++ b/emulator/le.c
> > @@ -20,7 +20,9 @@
> > #include <sys/socket.h>
> > #include <sys/un.h>
> > #include <sys/uio.h>
> > +#ifdef HAVE_GETRANDOM
> > #include <sys/random.h>
> > +#endif
> > #include <time.h>
> >
> > #include "lib/bluetooth.h"
> > @@ -509,10 +511,15 @@ static unsigned int get_adv_delay(void)
> >       /* The advertising delay is a pseudo-random value with a range
> >        * of 0 ms to 10 ms generated for each advertising event.
> >        */
> > +#ifdef HAVE_GETRANDOM
> >       if (getrandom(&val, sizeof(val), 0) < 0) {
> >               /* If it fails to get the random number, use a static val=
ue */
> >               val =3D 5;
> >       }
> > +#else
> > +     srand(time(NULL));
> > +     val =3D rand();
> > +#endif
>
> you need to introduce a src/missing.h and provide a getrandom fallback. I=
 am not allowing to spread #ifdef around the code for some old glibc compat=
ibility.
OK, I'll send a v2.
>
> Regards
>
> Marcel
>
Best Regards,

Fabrice